From bb53181f97ce0a2aa2e6e9e8eb89ba61355f4a42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi.denis-courmont@nokia.com>
Date: Tue, 21 Jul 2009 01:57:58 +0000
Subject: [PATCH] --- yaml --- r: 159023 b: refs/heads/master c:
 2eee40c7f7c3734b28456169b2945e07d5ac0e2d h: refs/heads/master i:   159021:
 400a9aafc63fac494dc59f24bf1afa77de5514c6   159019:
 70f726083db7d69aa05eb1cdd4479f7a7ef47cfa   159015:
 363cce3f6b2818bc65e145f1164da2ac86ded44e   159007:
 0fbb73e8845fb2e8f42f08a8bfdc78d879ed0e3f v: v3

---
 [refs]                      | 2 +-
 trunk/net/phonet/datagram.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eea7ce838713..3ad5a1b62284 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e2fb4b33d62c742019774c5e6e47711a3d60505
+refs/heads/master: 2eee40c7f7c3734b28456169b2945e07d5ac0e2d
diff --git a/trunk/net/phonet/datagram.c b/trunk/net/phonet/datagram.c
index e087862ed7e4..ef5c75c372e4 100644
--- a/trunk/net/phonet/datagram.c
+++ b/trunk/net/phonet/datagram.c
@@ -159,8 +159,11 @@ static int pn_recvmsg(struct kiocb *iocb, struct sock *sk,
 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;
 }