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

Commit c01a1cb6 authored by Jiri Pirko's avatar Jiri Pirko Committed by Sasha Levin
Browse files

vlan: kill vlan_put_tag helper 



[ Upstream commit b4bef1b57544b18899eb15569e3bafd8d2eeeff6 ]

Since both tx and rx paths work with skb->vlan_tci, there's no need for
this function anymore. Switch users directly to __vlan_hwaccel_put_tag.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent ca7c7b90

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

+2 −6
Original line number Diff line number Diff line
@@ -2156,12 +2156,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/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;

}

include/linux/if_vlan.h

+0 −18
Original line number Diff line number Diff line
@@ -356,24 +356,6 @@ static inline struct sk_buff *__vlan_hwaccel_put_tag(struct sk_buff *skb, 
	return skb;

}



/**

 * vlan_put_tag - inserts VLAN tag according to device features

 * @skb: skbuff to tag

 * @vlan_tci: VLAN TCI to insert

 *

 * Assumes skb->dev is the target that will xmit this frame.

 * Returns a VLAN tagged skb.

 */

static inline struct sk_buff *vlan_put_tag(struct sk_buff *skb,

					   __be16 vlan_proto, u16 vlan_tci)

{

	if (vlan_hw_offload_capable(skb->dev->features, vlan_proto)) {

		return __vlan_hwaccel_put_tag(skb, vlan_proto, vlan_tci);

	} else {

		return __vlan_put_tag(skb, vlan_proto, vlan_tci);

	}

}



/**

 * __vlan_get_tag - get the VLAN ID that is part of the payload

 * @skb: skbuff to query