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

Merge branch 'net-Remove-VLAN_TAG_PRESENT-from-drivers' 



Michał Mirosław says:

====================
net: Remove VLAN_TAG_PRESENT from drivers

This series removes VLAN_TAG_PRESENT use from network drivers in
preparation to removing its special meaning.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0d404a61 f4f9a5e6

drivers/infiniband/hw/i40iw/i40iw_cm.c

+4 −4
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static struct i40iw_puda_buf *i40iw_form_cm_frame(struct i40iw_cm_node *cm_node, 
	if (pdata)

		pd_len = pdata->size;



	if (cm_node->vlan_id < VLAN_TAG_PRESENT)

	if (cm_node->vlan_id <= VLAN_VID_MASK)

		eth_hlen += 4;



	if (cm_node->ipv4)
@@ -433,7 +433,7 @@ static struct i40iw_puda_buf *i40iw_form_cm_frame(struct i40iw_cm_node *cm_node, 


		ether_addr_copy(ethh->h_dest, cm_node->rem_mac);

		ether_addr_copy(ethh->h_source, cm_node->loc_mac);

		if (cm_node->vlan_id < VLAN_TAG_PRESENT) {

		if (cm_node->vlan_id <= VLAN_VID_MASK) {

			((struct vlan_ethhdr *)ethh)->h_vlan_proto = htons(ETH_P_8021Q);

			vtag = (cm_node->user_pri << VLAN_PRIO_SHIFT) | cm_node->vlan_id;

			((struct vlan_ethhdr *)ethh)->h_vlan_TCI = htons(vtag);
@@ -463,7 +463,7 @@ static struct i40iw_puda_buf *i40iw_form_cm_frame(struct i40iw_cm_node *cm_node, 


		ether_addr_copy(ethh->h_dest, cm_node->rem_mac);

		ether_addr_copy(ethh->h_source, cm_node->loc_mac);

		if (cm_node->vlan_id < VLAN_TAG_PRESENT) {

		if (cm_node->vlan_id <= VLAN_VID_MASK) {

			((struct vlan_ethhdr *)ethh)->h_vlan_proto = htons(ETH_P_8021Q);

			vtag = (cm_node->user_pri << VLAN_PRIO_SHIFT) | cm_node->vlan_id;

			((struct vlan_ethhdr *)ethh)->h_vlan_TCI = htons(vtag);
@@ -3323,7 +3323,7 @@ static void i40iw_init_tcp_ctx(struct i40iw_cm_node *cm_node, 


	tcp_info->flow_label = 0;

	tcp_info->snd_mss = cpu_to_le32(((u32)cm_node->tcp_cntxt.mss));

	if (cm_node->vlan_id < VLAN_TAG_PRESENT) {

	if (cm_node->vlan_id <= VLAN_VID_MASK) {

		tcp_info->insert_vlan_tag = true;

		tcp_info->vlan_tag = cpu_to_le16(((u16)cm_node->user_pri << I40IW_VLAN_PRIO_SHIFT) |

						  cm_node->vlan_id);

drivers/net/ethernet/broadcom/cnic.c

+1 −1
Original line number Diff line number Diff line
@@ -5731,7 +5731,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event, 
		if (realdev) {

			dev = cnic_from_netdev(realdev);

			if (dev) {

				vid |= VLAN_TAG_PRESENT;

				vid |= VLAN_CFI_MASK;	/* make non-zero */

				cnic_rcv_netevent(dev->cnic_priv, event, vid);

				cnic_put(dev);

			}

drivers/net/ethernet/freescale/gianfar_ethtool.c

+3 −5
Original line number Diff line number Diff line
@@ -1134,12 +1134,10 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule, 
		prio = vlan_tci_prio(rule);

		prio_mask = vlan_tci_priom(rule);



		if (cfi == VLAN_TAG_PRESENT && cfi_mask == VLAN_TAG_PRESENT) {

		if (cfi_mask) {

			if (cfi)

				vlan |= RQFPR_CFI;

			vlan_mask |= RQFPR_CFI;

		} else if (cfi != VLAN_TAG_PRESENT &&

			   cfi_mask == VLAN_TAG_PRESENT) {

			vlan_mask |= RQFPR_CFI;

		}

	}

net/openvswitch/actions.c

+9 −4
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static int push_vlan(struct sk_buff *skb, struct sw_flow_key *key, 
		key->eth.vlan.tpid = vlan->vlan_tpid;

	}

	return skb_vlan_push(skb, vlan->vlan_tpid,

			     ntohs(vlan->vlan_tci) & ~VLAN_TAG_PRESENT);

			     ntohs(vlan->vlan_tci) & ~VLAN_CFI_MASK);

}



/* 'src' is already properly masked. */
@@ -822,8 +822,10 @@ static int ovs_vport_output(struct net *net, struct sock *sk, struct sk_buff *sk 
	__skb_dst_copy(skb, data->dst);

	*OVS_CB(skb) = data->cb;

	skb->inner_protocol = data->inner_protocol;

	skb->vlan_tci = data->vlan_tci;

	skb->vlan_proto = data->vlan_proto;

	if (data->vlan_tci & VLAN_CFI_MASK)

		__vlan_hwaccel_put_tag(skb, data->vlan_proto, data->vlan_tci & ~VLAN_CFI_MASK);

	else

		__vlan_hwaccel_clear_tag(skb);



	/* Reconstruct the MAC header.  */

	skb_push(skb, data->l2_len);
@@ -867,7 +869,10 @@ static void prepare_frag(struct vport *vport, struct sk_buff *skb, 
	data->cb = *OVS_CB(skb);

	data->inner_protocol = skb->inner_protocol;

	data->network_offset = orig_network_offset;

	data->vlan_tci = skb->vlan_tci;

	if (skb_vlan_tag_present(skb))

		data->vlan_tci = skb_vlan_tag_get(skb) | VLAN_CFI_MASK;

	else

		data->vlan_tci = 0;

	data->vlan_proto = skb->vlan_proto;

	data->mac_proto = mac_proto;

	data->l2_len = hlen;

net/openvswitch/flow.c

+2 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int parse_vlan_tag(struct sk_buff *skb, struct vlan_head *key_vh, 
		return -ENOMEM;



	vh = (struct vlan_head *)skb->data;

	key_vh->tci = vh->tci | htons(VLAN_TAG_PRESENT);

	key_vh->tci = vh->tci | htons(VLAN_CFI_MASK);

	key_vh->tpid = vh->tpid;



	if (unlikely(untag_vlan)) {
@@ -358,7 +358,7 @@ static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key) 
	int res;



	if (skb_vlan_tag_present(skb)) {

		key->eth.vlan.tci = htons(skb->vlan_tci);

		key->eth.vlan.tci = htons(skb->vlan_tci) | htons(VLAN_CFI_MASK);

		key->eth.vlan.tpid = skb->vlan_proto;

	} else {

		/* Parse outer vlan tag in the non-accelerated case. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE