Commit b960a0ac authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

vlan: make __vlan_hwaccel_put_tag return void 



Always returns the same skb it gets, so change to void.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1abcd82c

drivers/scsi/fcoe/fcoe.c

+2 −4
Original line number Diff line number Diff line
@@ -1669,10 +1669,8 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp) 
	    fcoe->realdev->features & NETIF_F_HW_VLAN_CTAG_TX) {

		/* must set skb->dev before calling vlan_put_tag */

		skb->dev = fcoe->realdev;

		skb = __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),

		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),

				       vlan_dev_vlan_id(fcoe->netdev));

		if (!skb)

			return -ENOMEM;

	} else

		skb->dev = fcoe->netdev;

include/linux/if_vlan.h

+4 −5
Original line number Diff line number Diff line
@@ -347,13 +347,11 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, 
 *

 * Puts the VLAN TCI in @skb->vlan_tci and lets the device do the rest

 */

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

						     __be16 vlan_proto,

						     u16 vlan_tci)

static inline void __vlan_hwaccel_put_tag(struct sk_buff *skb,

					  __be16 vlan_proto, u16 vlan_tci)

{

	skb->vlan_proto = vlan_proto;

	skb->vlan_tci = VLAN_TAG_PRESENT | vlan_tci;

	return skb;

}



/**
@@ -368,7 +366,8 @@ 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);

		__vlan_hwaccel_put_tag(skb, vlan_proto, vlan_tci);

		return skb;

	} else {

		return __vlan_put_tag(skb, vlan_proto, vlan_tci);

	}

net/8021q/vlan_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb, 
		u16 vlan_tci;

		vlan_tci = vlan->vlan_id;

		vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb->priority);

		skb = __vlan_hwaccel_put_tag(skb, vlan->vlan_proto, vlan_tci);

		__vlan_hwaccel_put_tag(skb, vlan->vlan_proto, vlan_tci);

	}



	skb->dev = vlan->real_dev;