forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

be2net: Fix configuring VLAN for VF for Lancer

Browse source 
Allow adding VLANs for Lancer VF.
VLAN ID 0 should not be added to list of VLANs sent to FW.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Padmanabh Ratnakar 2012-10-20 06:02:40 +00:00 • committed by David S. Miller
commit a85e998681
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/ethernet/emulex/benet/be_main.c
View file

@ -879,11 +879,15 @@ static int be_vlan_add_vid(struct net_device *netdev, u16 vid)
struct be_adapter *adapter = netdev_priv(netdev); struct be_adapter *adapter = netdev_priv(netdev);
int status = 0; int status = 0;
if (!be_physfn(adapter)) { if (!lancer_chip(adapter) && !be_physfn(adapter)) {
status = -EINVAL; status = -EINVAL;
goto ret; goto ret;
} }
/* Packets with VID 0 are always received by Lancer by default */
if (lancer_chip(adapter) && vid == 0)
goto ret;
adapter->vlan_tag[vid] = 1; adapter->vlan_tag[vid] = 1;
if (adapter->vlans_added <= (adapter->max_vlans + 1)) if (adapter->vlans_added <= (adapter->max_vlans + 1))
status = be_vid_config(adapter); status = be_vid_config(adapter);
@ -901,11 +905,15 @@ static int be_vlan_rem_vid(struct net_device *netdev, u16 vid)
struct be_adapter *adapter = netdev_priv(netdev); struct be_adapter *adapter = netdev_priv(netdev);
int status = 0; int status = 0;
if (!be_physfn(adapter)) { if (!lancer_chip(adapter) && !be_physfn(adapter)) {
status = -EINVAL; status = -EINVAL;
goto ret; goto ret;
} }
/* Packets with VID 0 are always received by Lancer by default */
if (lancer_chip(adapter) && vid == 0)
goto ret;
adapter->vlan_tag[vid] = 0; adapter->vlan_tag[vid] = 0;
if (adapter->vlans_added <= adapter->max_vlans) if (adapter->vlans_added <= adapter->max_vlans)
status = be_vid_config(adapter); status = be_vid_config(adapter);