summaryrefslogtreecommitdiff
path: root/include/linux/if_vlan.h
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2014-11-19 16:04:56 +0300
committerDavid S. Miller <davem@davemloft.net>2014-11-21 22:20:16 +0300
commitb960a0ac6939ef4962c5abbf33e80d1382b45fc1 (patch)
tree8ec2827b9838d2f5377b3fb962e844d9f097bb9a /include/linux/if_vlan.h
parent1abcd82c20e7cbfd2b89d834b24ff68feae158ec (diff)
downloadlinux-b960a0ac6939ef4962c5abbf33e80d1382b45fc1.tar.xz
vlan: make __vlan_hwaccel_put_tag return void
Always returns the same skb it gets, so change to void. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Acked-by: Pravin B Shelar <pshelar@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_vlan.h')
-rw-r--r--include/linux/if_vlan.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index d69f0577a319..1b5dbc2711f9 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -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);
}