Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 939cf306 authored by Somnath Kotur's avatar Somnath Kotur Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarSomnath Kotur <somnath.kotur@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96b0accb

drivers/net/ethernet/emulex/benet/be_cmds.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

}

}

drivers/net/ethernet/emulex/benet/be_main.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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;

	}

	}