aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/emulex
diff options
context:
space:
mode:
authorAjit Khaparde <ajit.khaparde@emulex.com>2013-09-27 16:18:28 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-27 17:11:49 -0400
commit45c459739e849b5a26a4b9a552460b1e601a32fc (patch)
tree75750ff2d524d56459f76ac5e6918637c8fc6460 /drivers/net/ethernet/emulex
parent1aa9673c209e5701d7226e9389349b53fa560536 (diff)
be2net: Fix to allow VLAN configuration on VF interfaces.
Now the VF interfaces have privilege to add VLANs. Allow VLANs to be configured on these interfaces. Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 2962d2ff9f1c..9c25607e5f58 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1055,10 +1055,6 @@ static int be_vlan_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
1055 struct be_adapter *adapter = netdev_priv(netdev); 1055 struct be_adapter *adapter = netdev_priv(netdev);
1056 int status = 0; 1056 int status = 0;
1057 1057
1058 if (!lancer_chip(adapter) && !be_physfn(adapter)) {
1059 status = -EINVAL;
1060 goto ret;
1061 }
1062 1058
1063 /* Packets with VID 0 are always received by Lancer by default */ 1059 /* Packets with VID 0 are always received by Lancer by default */
1064 if (lancer_chip(adapter) && vid == 0) 1060 if (lancer_chip(adapter) && vid == 0)
@@ -1081,11 +1077,6 @@ static int be_vlan_rem_vid(struct net_device *netdev, __be16 proto, u16 vid)
1081 struct be_adapter *adapter = netdev_priv(netdev); 1077 struct be_adapter *adapter = netdev_priv(netdev);
1082 int status = 0; 1078 int status = 0;
1083 1079
1084 if (!lancer_chip(adapter) && !be_physfn(adapter)) {
1085 status = -EINVAL;
1086 goto ret;
1087 }
1088
1089 /* Packets with VID 0 are always received by Lancer by default */ 1080 /* Packets with VID 0 are always received by Lancer by default */
1090 if (lancer_chip(adapter) && vid == 0) 1081 if (lancer_chip(adapter) && vid == 0)
1091 goto ret; 1082 goto ret;