diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /net/ipv4/xfrm4_mode_tunnel.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'net/ipv4/xfrm4_mode_tunnel.c')
| -rw-r--r-- | net/ipv4/xfrm4_mode_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c index eb1dd4d643f2..b5663c37f089 100644 --- a/net/ipv4/xfrm4_mode_tunnel.c +++ b/net/ipv4/xfrm4_mode_tunnel.c | |||
| @@ -117,7 +117,7 @@ static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) | |||
| 117 | 117 | ||
| 118 | top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ? | 118 | top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ? |
| 119 | 0 : (XFRM_MODE_SKB_CB(skb)->frag_off & htons(IP_DF)); | 119 | 0 : (XFRM_MODE_SKB_CB(skb)->frag_off & htons(IP_DF)); |
| 120 | ip_select_ident(top_iph, dst->child, NULL); | 120 | ip_select_ident(skb, dst->child, NULL); |
| 121 | 121 | ||
| 122 | top_iph->ttl = ip4_dst_hoplimit(dst->child); | 122 | top_iph->ttl = ip4_dst_hoplimit(dst->child); |
| 123 | 123 | ||