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>
This commit is contained in:
parent
58da018053
commit
abf7c1c540
|
@ -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 rt6_info *rt = (struct rt6_info *)skb_dst(skb);
|
||||||
struct lwtunnel_state *lwtstate = NULL;
|
struct lwtunnel_state *lwtstate = NULL;
|
||||||
|
|
||||||
if (rt)
|
if (rt) {
|
||||||
lwtstate = rt->rt6i_lwtstate;
|
lwtstate = rt->rt6i_lwtstate;
|
||||||
|
skb->dev = rt->dst.dev;
|
||||||
|
}
|
||||||
|
|
||||||
|
skb->protocol = htons(ETH_P_IPV6);
|
||||||
|
|
||||||
return __lwtunnel_output(sk, skb, lwtstate);
|
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 rtable *rt = (struct rtable *)skb_dst(skb);
|
||||||
struct lwtunnel_state *lwtstate = NULL;
|
struct lwtunnel_state *lwtstate = NULL;
|
||||||
|
|
||||||
if (rt)
|
if (rt) {
|
||||||
lwtstate = rt->rt_lwtstate;
|
lwtstate = rt->rt_lwtstate;
|
||||||
|
skb->dev = rt->dst.dev;
|
||||||
|
}
|
||||||
|
|
||||||
|
skb->protocol = htons(ETH_P_IP);
|
||||||
|
|
||||||
return __lwtunnel_output(sk, skb, lwtstate);
|
return __lwtunnel_output(sk, skb, lwtstate);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue