linux-next: manual merge of the ipsec-next tere

[Thierry Reding]

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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/