* linux-next: manual merge of the net-next tree with the ipsec tree
@ 2014-05-13 3:53 Stephen Rothwell
2014-05-13 4:05 ` Cong Wang
2014-05-13 4:07 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2014-05-13 3:53 UTC (permalink / raw)
To: David Miller, netdev, Steffen Klassert
Cc: linux-next, linux-kernel, WANG Cong
[-- Attachment #1: Type: text/plain, Size: 981 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/ipv6/xfrm6_output.c between commit 5596732fa8c1 ("xfrm: Fix crash
with ipv6 IPsec tunnel and NAT") from the ipsec tree and commit
60ff746739bf ("net: rename local_df to ignore_df") from the net-next
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/ipv6/xfrm6_output.c
index b930d080c66f,f47c8b153dd3..000000000000
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@@ -114,7 -114,13 +114,7 @@@ int xfrm6_prepare_output(struct xfrm_st
if (err)
return err;
- skb->local_df = 1;
- memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
-#ifdef CONFIG_NETFILTER
- IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
-#endif
-
- skb->protocol = htons(ETH_P_IPV6);
+ skb->ignore_df = 1;
return x->outer_mode->output2(x, skb);
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the net-next tree with the ipsec tree
2014-05-13 3:53 linux-next: manual merge of the net-next tree with the ipsec tree Stephen Rothwell
@ 2014-05-13 4:05 ` Cong Wang
2014-05-13 4:07 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: Cong Wang @ 2014-05-13 4:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Linux Kernel Network Developers, Steffen Klassert,
linux-next, LKML
On Mon, May 12, 2014 at 8:53 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> net/ipv6/xfrm6_output.c between commit 5596732fa8c1 ("xfrm: Fix crash
> with ipv6 IPsec tunnel and NAT") from the ipsec tree and commit
> 60ff746739bf ("net: rename local_df to ignore_df") from the net-next
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Looks good. Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the net-next tree with the ipsec tree
2014-05-13 3:53 linux-next: manual merge of the net-next tree with the ipsec tree Stephen Rothwell
2014-05-13 4:05 ` Cong Wang
@ 2014-05-13 4:07 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2014-05-13 4:07 UTC (permalink / raw)
To: sfr; +Cc: netdev, steffen.klassert, linux-next, linux-kernel, xiyou.wangcong
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 May 2014 13:53:22 +1000
> Today's linux-next merge of the net-next tree got a conflict in
> net/ipv6/xfrm6_output.c between commit 5596732fa8c1 ("xfrm: Fix crash
> with ipv6 IPsec tunnel and NAT") from the ipsec tree and commit
> 60ff746739bf ("net: rename local_df to ignore_df") from the net-next
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks Stephen.
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the net-next tree with the ipsec tree
@ 2015-10-06 0:24 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2015-10-06 0:24 UTC (permalink / raw)
To: David Miller, netdev, Steffen Klassert
Cc: linux-next, linux-kernel, Herbert Xu, Eric W. Biederman
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv6/xfrm6_output.c
between commit:
93efac3f2e03 ("ipv6: Fix IPsec pre-encap fragmentation check")
from the ipsec tree and commit:
7d8c6e391575 ("ipv6: Pass struct net through ip6_fragment")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/ipv6/xfrm6_output.c
index be033f22a3f3,4cefda009f53..000000000000
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@@ -163,11 -164,12 +170,11 @@@ static int __xfrm6_output(struct net *n
return -EMSGSIZE;
}
- if (x->props.mode == XFRM_MODE_TUNNEL &&
- ((skb->len > mtu && !skb_is_gso(skb)) ||
- dst_allfrag(skb_dst(skb)))) {
+ if (toobig || dst_allfrag(skb_dst(skb)))
- return ip6_fragment(sk, skb,
- x->outer_mode->afinfo->output_finish);
+ return ip6_fragment(net, sk, skb,
+ __xfrm6_output_finish);
- }
+
+skip_frag:
return x->outer_mode->afinfo->output_finish(sk, skb);
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-10-06 0:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-13 3:53 linux-next: manual merge of the net-next tree with the ipsec tree Stephen Rothwell
2014-05-13 4:05 ` Cong Wang
2014-05-13 4:07 ` David Miller
2015-10-06 0:24 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).