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

Commit fdf81bfb authored by Sathya Perla's avatar Sathya Perla Committed by David S. Miller
Browse files

be2net: remove a line of code that has no effect 



This patch removes a line of code that changes adapter->recommended_prio
value followed by yet another assignment.
Also, the variable is used to store the vlan priority value that is already
shifted to the PCP bits position in the vlan tag format. Hence, the name of
this variable is changed to recommended_prio_bits.

Signed-off-by: default avatarSathya Perla <sathya.perla@avagotech.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b525782

drivers/net/ethernet/emulex/benet/be.h

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ struct be_adapter { 
	struct be_drv_stats drv_stats;

	struct be_aic_obj aic_obj[MAX_EVT_QS];

	u8 vlan_prio_bmap;	/* Available Priority BitMap */

	u16 recommended_prio;	/* Recommended Priority */

	u16 recommended_prio_bits;/* Recommended Priority bits in vlan tag */

	struct be_dma_mem rx_filter; /* Cmd DMA mem for rx-filter */



	struct be_dma_mem stats_cmd;

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

+1 −2
Original line number Diff line number Diff line
@@ -308,8 +308,7 @@ static void be_async_grp5_cos_priority_process(struct be_adapter *adapter, 


	if (evt->valid) {

		adapter->vlan_prio_bmap = evt->available_priority_bmap;

		adapter->recommended_prio &= ~VLAN_PRIO_MASK;

		adapter->recommended_prio =

		adapter->recommended_prio_bits =

			evt->reco_default_priority << VLAN_PRIO_SHIFT;

	}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ static inline u16 be_get_tx_vlan_tag(struct be_adapter *adapter, 
	/* If vlan priority provided by OS is NOT in available bmap */

	if (!(adapter->vlan_prio_bmap & (1 << vlan_prio)))

		vlan_tag = (vlan_tag & ~VLAN_PRIO_MASK) |

				adapter->recommended_prio;

				adapter->recommended_prio_bits;



	return vlan_tag;

}