hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

be2net: Storing the 'vid' got by the grp5 event instead of storing the vlan_tag 

Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Somnath Kotur 2011-08-18 21:51:49 -07:00 committed by David S. Miller
parent 96b0accb88
commit 939cf3069d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/emulex/benet/be_cmds.c
View File

@ -140,7 +140,7 @@ static void be_async_grp5_pvid_state_process(struct be_adapter *adapter,
struct be_async_event_grp5_pvid_state *evt) struct be_async_event_grp5_pvid_state *evt)
{ {
if (evt->enabled) if (evt->enabled)
adapter->pvid = le16_to_cpu(evt->tag); adapter->pvid = le16_to_cpu(evt->tag) & VLAN_VID_MASK;
else else
adapter->pvid = 0; adapter->pvid = 0;
} }

3
drivers/net/ethernet/emulex/benet/be_main.c
View File

@ -1277,8 +1277,7 @@ static struct be_rx_compl_info *be_rx_compl_get(struct be_rx_obj *rxo)
if (!lancer_chip(adapter)) if (!lancer_chip(adapter))
rxcp->vlan_tag = swab16(rxcp->vlan_tag); rxcp->vlan_tag = swab16(rxcp->vlan_tag);
if (((adapter->pvid & VLAN_VID_MASK) == if (adapter->pvid == (rxcp->vlan_tag & VLAN_VID_MASK) &&
(rxcp->vlan_tag & VLAN_VID_MASK)) &&
!adapter->vlan_tag[rxcp->vlan_tag]) !adapter->vlan_tag[rxcp->vlan_tag])
rxcp->vlanf = 0; rxcp->vlanf = 0;
} }