From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
netdev@vger•kernel.org,
Steffen Klassert <steffen.klassert@secunet•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Herbert Xu <herbert@gondor•apana.org.au>,
"Eric W. Biederman" <ebiederm@xmission•com>
Subject: linux-next: manual merge of the net-next tree with the ipsec tree
Date: Tue, 6 Oct 2015 11:24:55 +1100 [thread overview]
Message-ID: <20151006112455.584daaf0@canb.auug.org.au> (raw)
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);
}
next reply other threads:[~2015-10-06 0:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-06 0:24 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151006112455.584daaf0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=ebiederm@xmission$(echo .)com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=steffen.klassert@secunet$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox