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

Merge branch 'vlan_action' 



Jiri Pirko says:

====================
sched: introduce vlan action

Please see the individual patches for info
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fe159122 c7e2b968

drivers/net/bonding/bond_alb.c

+4 −13
Original line number Diff line number Diff line
@@ -475,12 +475,8 @@ static void rlb_update_client(struct rlb_client_info *client_info) 
		skb->dev = client_info->slave->dev;



		if (client_info->vlan_id) {

			skb = vlan_put_tag(skb, htons(ETH_P_8021Q), client_info->vlan_id);

			if (!skb) {

				netdev_err(client_info->slave->bond->dev,

					   "failed to insert VLAN tag\n");

				continue;

			}

			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),

					       client_info->vlan_id);

		}



		arp_xmit(skb);
@@ -951,13 +947,8 @@ static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[], 
	skb->priority = TC_PRIO_CONTROL;

	skb->dev = slave->dev;



	if (vid) {

		skb = vlan_put_tag(skb, vlan_proto, vid);

		if (!skb) {

			netdev_err(slave->bond->dev, "failed to insert VLAN tag\n");

			return;

		}

	}

	if (vid)

		__vlan_hwaccel_put_tag(skb, vlan_proto, vid);



	dev_queue_xmit(skb);

}

drivers/net/bonding/bond_main.c

+4 −8
Original line number Diff line number Diff line
@@ -2146,7 +2146,7 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, 


		netdev_dbg(slave_dev, "inner tag: proto %X vid %X\n",

			   ntohs(outer_tag->vlan_proto), tags->vlan_id);

		skb = __vlan_put_tag(skb, tags->vlan_proto,

		skb = vlan_insert_tag_set_proto(skb, tags->vlan_proto,

						tags->vlan_id);

		if (!skb) {

			net_err_ratelimited("failed to insert inner VLAN tag\n");
@@ -2159,12 +2159,8 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, 
	if (outer_tag->vlan_id) {

		netdev_dbg(slave_dev, "outer tag: proto %X vid %X\n",

			   ntohs(outer_tag->vlan_proto), outer_tag->vlan_id);

		skb = vlan_put_tag(skb, outer_tag->vlan_proto,

		__vlan_hwaccel_put_tag(skb, outer_tag->vlan_proto,

				       outer_tag->vlan_id);

		if (!skb) {

			net_err_ratelimited("failed to insert outer VLAN tag\n");

			return;

		}

	}



xmit:

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

+4 −2
Original line number Diff line number Diff line
@@ -887,7 +887,8 @@ static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter, 
	}



	if (vlan_tag) {

		skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);

		skb = vlan_insert_tag_set_proto(skb, htons(ETH_P_8021Q),

						vlan_tag);

		if (unlikely(!skb))

			return skb;

		skb->vlan_tci = 0;
@@ -896,7 +897,8 @@ static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter, 
	/* Insert the outer VLAN, if any */

	if (adapter->qnq_vid) {

		vlan_tag = adapter->qnq_vid;

		skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);

		skb = vlan_insert_tag_set_proto(skb, htons(ETH_P_8021Q),

						vlan_tag);

		if (unlikely(!skb))

			return skb;

		if (skip_hw_vlan)

drivers/net/usb/cdc_mbim.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static struct sk_buff *cdc_mbim_process_dgram(struct usbnet *dev, u8 *buf, size_ 


	/* map MBIM session to VLAN */

	if (tci)

		vlan_put_tag(skb, htons(ETH_P_8021Q), tci);

		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), tci);

err:

	return skb;

}

drivers/net/vxlan.c

+6 −16
Original line number Diff line number Diff line
@@ -1599,15 +1599,10 @@ static int vxlan6_xmit_skb(struct vxlan_sock *vs, 
	if (unlikely(err))

		return err;



	if (vlan_tx_tag_present(skb)) {

		if (WARN_ON(!__vlan_put_tag(skb,

					    skb->vlan_proto,

					    vlan_tx_tag_get(skb))))

	skb = vlan_hwaccel_push_inside(skb);

	if (WARN_ON(!skb))

		return -ENOMEM;



		skb->vlan_tci = 0;

	}



	vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));

	vxh->vx_flags = htonl(VXLAN_FLAGS);

	vxh->vx_vni = vni;
@@ -1643,15 +1638,10 @@ int vxlan_xmit_skb(struct vxlan_sock *vs, 
	if (unlikely(err))

		return err;



	if (vlan_tx_tag_present(skb)) {

		if (WARN_ON(!__vlan_put_tag(skb,

					    skb->vlan_proto,

					    vlan_tx_tag_get(skb))))

	skb = vlan_hwaccel_push_inside(skb);

	if (WARN_ON(!skb))

		return -ENOMEM;



		skb->vlan_tci = 0;

	}



	vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));

	vxh->vx_flags = htonl(VXLAN_FLAGS);

	vxh->vx_vni = vni;