diff options
| author |   Alexander Duyck <alexander.h.duyck@redhat.com> | 2015-05-27 07:16:43 -0700 |
|---|---|---|
| committer |   Steffen Klassert <steffen.klassert@secunet.com> | 2015-05-28 06:23:31 +0200 |
| commit | cd5279c194f89c9b97c294af4aaf4ea8c5e3c704 (patch) | |
| tree | f591028fd9acc2914fd7470f2f4ba7e5f0f6377c /net/ipv4/ip_vti.c | |
| parent | xfrm: Always zero high-order sequence number bits (diff) | |
| download | linux-dev-cd5279c194f89c9b97c294af4aaf4ea8c5e3c704.tar.xz linux-dev-cd5279c194f89c9b97c294af4aaf4ea8c5e3c704.zip | |
ip_vti/ip6_vti: Do not touch skb->mark on xmit
Instead of modifying skb->mark we can simply modify the flowi_mark that is
generated as a result of the xfrm_decode_session. By doing this we don't
need to actually touch the skb->mark and it can be preserved as it passes
out through the tunnel.
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/ip_vti.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 9f7269f3c54a..4c318e1c13c8 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -216,8 +216,6 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) memset(&fl, 0, sizeof(fl)); - skb->mark = be32_to_cpu(tunnel->parms.o_key); - switch (skb->protocol) { case htons(ETH_P_IP): xfrm_decode_session(skb, &fl, AF_INET); @@ -233,6 +231,9 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_OK; } + /* override mark with tunnel output key */ + fl.flowi_mark = be32_to_cpu(tunnel->parms.o_key); + return vti_xmit(skb, dev, &fl); } |