]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
af_key: remove a duplicated skb_orphan()
authorCong Wang <xiyou.wangcong@gmail.com>
Wed, 23 Jan 2013 14:52:27 +0000 (22:52 +0800)
committerSteffen Klassert <steffen.klassert@secunet.com>
Mon, 28 Jan 2013 08:22:12 +0000 (09:22 +0100)
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>
net/key/af_key.c

index 5b426a6465447f954a4b4728f72a6c00966c91ee..6a6e68479b97f2317123c134e5ff9c7b8c16bd74 100644 (file)
@@ -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) {
        }
        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);
                        skb_set_owner_r(*skb2, sk);
                        skb_queue_tail(&sk->sk_receive_queue, *skb2);
                        sk->sk_data_ready(sk, (*skb2)->len);