From: Thierry Reding <thierry.reding@gmail.com>
To: Steffen Klassert <steffen.klassert@secunet.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the ipsec-next tere
Date: Tue, 22 Oct 2013 17:08:36 +0200 [thread overview]
Message-ID: <1382454517-4074-3-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1382454517-4074-1-git-send-email-treding@nvidia.com>
Today's linux-next merge of the ipsec-next tree got a conflict in
net/xfrm/xfrm_policy.c
caused by commits e7d8f6c (xfrm: Add refcount handling to queued policies)
and 4d53eff (xfrm: Don't queue retransmitted packets if the original is
still on the host).
I fixed it up (see below). Please verify that the resolution looks good.
Thanks,
Thierry
---
diff --cc net/xfrm/xfrm_policy.c
index 76e1873,e09edfc..9a91f74
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@@ -1842,8 -1831,14 +1842,15 @@@ static int xdst_queue_output(struct sk_
unsigned long sched_next;
struct dst_entry *dst = skb_dst(skb);
struct xfrm_dst *xdst = (struct xfrm_dst *) dst;
- struct xfrm_policy_queue *pq = &xdst->pols[0]->polq;
+ struct xfrm_policy *pol = xdst->pols[0];
+ struct xfrm_policy_queue *pq = &pol->polq;
+ const struct sk_buff *fclone = skb + 1;
+
+ if (unlikely(skb->fclone == SKB_FCLONE_ORIG &&
+ fclone->fclone == SKB_FCLONE_CLONE)) {
+ kfree_skb(skb);
+ return 0;
+ }
if (pq->hold_queue.qlen > XFRM_MAX_QUEUE_LEN) {
kfree_skb(skb);
next prev parent reply other threads:[~2013-10-22 15:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the arm tree Thierry Reding
2013-10-25 15:20 ` Dmitry Kravkov
2013-10-22 15:08 ` Thierry Reding [this message]
2013-10-22 15:08 ` linux-next: manual merge of the usb tree Thierry Reding
2013-10-22 18:02 ` Srinivas Pandruvada
2013-10-22 19:24 ` linux-next: Tree for Oct 22 Guenter Roeck
2013-10-22 22:04 ` linux-next: Tree for Oct 22 (xilinx_uartps) Randy Dunlap
2013-10-23 7:04 ` Greg Kroah-Hartman
2013-10-22 22:36 ` linux-next: Tree for Oct 22 (crypto/asymmetric_keys/rsa.c) Randy Dunlap
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=1382454517-4074-3-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).