diff options
author | Jiri Pirko <jiri@resnulli.us> | 2014-11-19 08:04:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-21 14:20:16 -0500 |
commit | b960a0ac6939ef4962c5abbf33e80d1382b45fc1 (patch) | |
tree | 8ec2827b9838d2f5377b3fb962e844d9f097bb9a /net/8021q | |
parent | 1abcd82c20e7cbfd2b89d834b24ff68feae158ec (diff) |
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.c | 2 |
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, | |||
150 | u16 vlan_tci; | 150 | u16 vlan_tci; |
151 | vlan_tci = vlan->vlan_id; | 151 | vlan_tci = vlan->vlan_id; |
152 | vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb->priority); | 152 | vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb->priority); |
153 | skb = __vlan_hwaccel_put_tag(skb, vlan->vlan_proto, vlan_tci); | 153 | __vlan_hwaccel_put_tag(skb, vlan->vlan_proto, vlan_tci); |
154 | } | 154 | } |
155 | 155 | ||
156 | skb->dev = vlan->real_dev; | 156 | skb->dev = vlan->real_dev; |