Commit 1e33f015 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'VLAN-tag-handling-cleanup' 



Michał Mirosław says:

====================
VLAN tag handling cleanup

This is a cleanup set after VLAN_TAG_PRESENT removal. The CFI bit
handling is made similar to how other tag fields are used.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 11c6c0c2 6c0fbd72

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

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static inline u16 be_get_tx_vlan_tag(struct be_adapter *adapter, 
	u16 vlan_tag;



	vlan_tag = skb_vlan_tag_get(skb);

	vlan_prio = (vlan_tag & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;

	vlan_prio = skb_vlan_tag_get_prio(skb);

	/* 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) |

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb, 
	else

#endif

		if (skb_vlan_tag_present(skb))

			up = skb->vlan_tci >> VLAN_PRIO_SHIFT;

			up = skb_vlan_tag_get_prio(skb);



	/* channel_ix can be larger than num_channels since

	 * dev->num_real_tx_queues = num_channels * num_tc

drivers/net/hyperv/netvsc_drv.c

+5 −4
Original line number Diff line number Diff line
@@ -605,9 +605,9 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) 
				     IEEE_8021Q_INFO);



		vlan->value = 0;

		vlan->vlanid = skb->vlan_tci & VLAN_VID_MASK;

		vlan->pri = (skb->vlan_tci & VLAN_PRIO_MASK) >>

				VLAN_PRIO_SHIFT;

		vlan->vlanid = skb_vlan_tag_get_id(skb);

		vlan->cfi = skb_vlan_tag_get_cfi(skb);

		vlan->pri = skb_vlan_tag_get_prio(skb);

	}



	if (skb_is_gso(skb)) {
@@ -781,7 +781,8 @@ static struct sk_buff *netvsc_alloc_recv_skb(struct net_device *net, 
	}



	if (vlan) {

		u16 vlan_tci = vlan->vlanid | (vlan->pri << VLAN_PRIO_SHIFT);

		u16 vlan_tci = vlan->vlanid | (vlan->pri << VLAN_PRIO_SHIFT) |

			(vlan->cfi ? VLAN_CFI_MASK : 0);



		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),

				       vlan_tci);

include/linux/if_vlan.h

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb) 


#define VLAN_PRIO_MASK		0xe000 /* Priority Code Point */

#define VLAN_PRIO_SHIFT		13

#define VLAN_CFI_MASK		0x1000 /* Canonical Format Indicator */

#define VLAN_CFI_MASK		0x1000 /* Canonical Format Indicator / Drop Eligible Indicator */

#define VLAN_VID_MASK		0x0fff /* VLAN Identifier */

#define VLAN_N_VID		4096
@@ -80,6 +80,7 @@ static inline bool is_vlan_dev(const struct net_device *dev) 
#define skb_vlan_tag_present(__skb)	((__skb)->vlan_present)

#define skb_vlan_tag_get(__skb)		((__skb)->vlan_tci)

#define skb_vlan_tag_get_id(__skb)	((__skb)->vlan_tci & VLAN_VID_MASK)

#define skb_vlan_tag_get_cfi(__skb)	(!!((__skb)->vlan_tci & VLAN_CFI_MASK))

#define skb_vlan_tag_get_prio(__skb)	(((__skb)->vlan_tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT)



static inline int vlan_get_rx_ctag_filter_info(struct net_device *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE