summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Shearman <rshearma@brocade.com>2015-08-03 19:39:20 +0300
committerDavid S. Miller <davem@davemloft.net>2015-08-04 08:26:13 +0300
commitabf7c1c540f8330fead5d50730d92606dcbe7a7e (patch)
treecee65cce6f018b8d63da4b6531c3885cf1947330
parent58da018053531b9cb91423a64f2a762ef0fe7456 (diff)
downloadlinux-abf7c1c540f8330fead5d50730d92606dcbe7a7e.tar.xz
lwtunnel: set skb protocol and dev
In the locally-generated packet path skb->protocol may not be set and this is required for the lwtunnel encap in order to get the lwtstate. This would otherwise have been set by ip_output or ip6_output so set skb->protocol prior to calling the lwtunnel encap function. Additionally set skb->dev in case it is needed further down the transmit path. Signed-off-by: Robert Shearman <rshearma@brocade.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/lwtunnel.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/net/core/lwtunnel.c b/net/core/lwtunnel.c
index c240c895b319..5d6d8e3d450a 100644
--- a/net/core/lwtunnel.c
+++ b/net/core/lwtunnel.c
@@ -215,8 +215,12 @@ int lwtunnel_output6(struct sock *sk, struct sk_buff *skb)
struct rt6_info *rt = (struct rt6_info *)skb_dst(skb);
struct lwtunnel_state *lwtstate = NULL;
- if (rt)
+ if (rt) {
lwtstate = rt->rt6i_lwtstate;
+ skb->dev = rt->dst.dev;
+ }
+
+ skb->protocol = htons(ETH_P_IPV6);
return __lwtunnel_output(sk, skb, lwtstate);
}
@@ -227,8 +231,12 @@ int lwtunnel_output(struct sock *sk, struct sk_buff *skb)
struct rtable *rt = (struct rtable *)skb_dst(skb);
struct lwtunnel_state *lwtstate = NULL;
- if (rt)
+ if (rt) {
lwtstate = rt->rt_lwtstate;
+ skb->dev = rt->dst.dev;
+ }
+
+ skb->protocol = htons(ETH_P_IP);
return __lwtunnel_output(sk, skb, lwtstate);
}