From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Tue, 8 May 2012 20:04:59 +0000 (-0700)
Subject: be2net: make be_vlan_add_vid() void
X-Git-Tag: v2.6.39-400.9.0~423^2~124^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=396d8b406f060f4acc057af6a960afbddd5c8bdb;p=users%2Fjedix%2Flinux-maple.git

be2net: make be_vlan_add_vid() void

Make compatibility for 3.0.x kernel, and make  be_vlan_add_vid() void.
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
---

diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index ff9b80178d796..79daca3758aeb 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -827,7 +827,7 @@ set_vlan_promisc:
 	return status;
 }
 
-static int be_vlan_add_vid(struct net_device *netdev, u16 vid)
+static void be_vlan_add_vid(struct net_device *netdev, u16 vid)
 {
 	struct be_adapter *adapter = netdev_priv(netdev);
 	int status = 0;
@@ -846,10 +846,11 @@ static int be_vlan_add_vid(struct net_device *netdev, u16 vid)
 	else
 		adapter->vlan_tag[vid] = 0;
 ret:
-	return status;
+	/*do not return status;, 3.0.X kernel compatibility*/
+	return;
 }
 
-static int be_vlan_rem_vid(struct net_device *netdev, u16 vid)
+static void be_vlan_rem_vid(struct net_device *netdev, u16 vid)
 {
 	struct be_adapter *adapter = netdev_priv(netdev);
 	int status = 0;
@@ -868,7 +869,8 @@ static int be_vlan_rem_vid(struct net_device *netdev, u16 vid)
 	else
 		adapter->vlan_tag[vid] = 1;
 ret:
-	return status;
+	/*do not return status;, 3.0.X kernel compatibility*/
+	return;
 }
 
 static void be_set_rx_mode(struct net_device *netdev)