diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2014-11-19 14:04:59 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-27 16:48:34 -0400 |
| commit | a67e2e88342accd49587d9bad72f6dabd7673f7c (patch) | |
| tree | 00749cb39b448bc725224e0a1f11d5d45fc1a2cf /net/ipv4 | |
| parent | d329729a26406301996d4ae63b3d7d489bd2f361 (diff) | |
vlan: introduce *vlan_hwaccel_push_inside helpers
[ Upstream commit 5968250c868ceee680aa77395b24e6ddcae17d36 ]
Use them to push skb->vlan_tci into the payload and avoid code
duplication.
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/geneve.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c index 6cdcd8cbb902..fd0fe18e3e3e 100644 --- a/net/ipv4/geneve.c +++ b/net/ipv4/geneve.c @@ -131,14 +131,9 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt, if (unlikely(err)) return err; - if (vlan_tx_tag_present(skb)) { - skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto, - vlan_tx_tag_get(skb)); - if (unlikely(!skb) - return -ENOMEM; - - skb->vlan_tci = 0; - } + skb = vlan_hwaccel_push_inside(skb); + if (unlikely(!skb)) + return -ENOMEM; gnvh = (struct genevehdr *)__skb_push(skb, sizeof(*gnvh) + opt_len); geneve_build_header(gnvh, tun_flags, vni, opt_len, opt); |