summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2013-01-23 22:52:27 +0800
committerSteffen Klassert <steffen.klassert@secunet.com>2013-01-28 09:22:12 +0100
commitcdfa1fe5c0d4f2815acfe8cd7730a0b3d8d0a3e9 (patch)
treea8f1d7241ef54b3d2510b0b80e9cb7ba2a19efe4
parentcef401de7be8c4e155c6746bfccf721a4fa5fab9 (diff)
downloadlinux-stable-cdfa1fe5c0d4f2815acfe8cd7730a0b3d8d0a3e9.tar.gz
linux-stable-cdfa1fe5c0d4f2815acfe8cd7730a0b3d8d0a3e9.tar.bz2
linux-stable-cdfa1fe5c0d4f2815acfe8cd7730a0b3d8d0a3e9.zip
af_key: remove a duplicated skb_orphan()
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> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
-rw-r--r--net/key/af_key.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 5b426a646544..6a6e68479b97 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);