netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [Patch net-next] af_key: remove a duplicated skb_orphan()
@ 2013-01-23 14:52 Cong Wang
  2013-01-28 10:02 ` Steffen Klassert
  0 siblings, 1 reply; 2+ messages in thread
From: Cong Wang @ 2013-01-23 14:52 UTC (permalink / raw)
  To: netdev; +Cc: Steffen Klassert, Herbert Xu, David S. Miller, Cong Wang

From: Cong Wang <xiyou.wangcong@gmail.com>

skb_set_owner_r() will call skb_orphan(), I don't
see any reason to call it twice.

Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>

---
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 5b426a6..6a6e684 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -203,7 +203,6 @@ static int pfkey_broadcast_one(struct sk_buff *skb, struct sk_buff **skb2,
 	}
 	if (*skb2 != NULL) {
 		if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) {
-			skb_orphan(*skb2);
 			skb_set_owner_r(*skb2, sk);
 			skb_queue_tail(&sk->sk_receive_queue, *skb2);
 			sk->sk_data_ready(sk, (*skb2)->len);

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Patch net-next] af_key: remove a duplicated skb_orphan()
  2013-01-23 14:52 [Patch net-next] af_key: remove a duplicated skb_orphan() Cong Wang
@ 2013-01-28 10:02 ` Steffen Klassert
  0 siblings, 0 replies; 2+ messages in thread
From: Steffen Klassert @ 2013-01-28 10:02 UTC (permalink / raw)
  To: Cong Wang; +Cc: netdev, Herbert Xu, David S. Miller

On Wed, Jan 23, 2013 at 10:52:27PM +0800, Cong Wang wrote:
> From: Cong Wang <xiyou.wangcong@gmail.com>
> 
> skb_set_owner_r() will call skb_orphan(), I don't
> see any reason to call it twice.
> 
> Cc: Steffen Klassert <steffen.klassert@secunet.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
> 

Applied to ipsec-next, thanks!

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-01-28 10:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-23 14:52 [Patch net-next] af_key: remove a duplicated skb_orphan() Cong Wang
2013-01-28 10:02 ` Steffen Klassert

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).