summaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2014-11-19 14:04:56 +0100
committerDavid S. Miller <davem@davemloft.net>2014-11-21 20:20:16 +0100
commitb960a0ac6939ef4962c5abbf33e80d1382b45fc1 (patch)
tree8ec2827b9838d2f5377b3fb962e844d9f097bb9a /net/8021q
parentopenvswitch: actions: use skb_postpull_rcsum when possible (diff)
downloadlinux-b960a0ac6939ef4962c5abbf33e80d1382b45fc1.tar.xz
linux-b960a0ac6939ef4962c5abbf33e80d1382b45fc1.zip
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 'net/8021q')
-rw-r--r--net/8021q/vlan_dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 0d441ec8763e..d6524b2b206a 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -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;