Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[~andy/linux] / net / phonet / datagram.c

diff --git a/net/phonet/datagram.c b/net/phonet/datagram.c
index ef5c75c372e41701965737ae04ed88c0f805c9f2..67f072e94d00f78394af72f2ad53014ad6e2b235 100644 (file)
--- a/net/phonet/datagram.c
+++ b/net/phonet/datagram.c
@@ -159,11 +159,9 @@ out_nofree:
 static int pn_backlog_rcv(struct sock *sk, struct sk_buff *skb)
 {
        int err = sock_queue_rcv_skb(sk, skb);
-       if (err < 0) {
+
+       if (err < 0)
                kfree_skb(skb);
-               if (err == -ENOMEM)
-                       atomic_inc(&sk->sk_drops);
-       }
        return err ? NET_RX_DROP : NET_RX_SUCCESS;
 }