This one is used only under ifdef PACKET_REFCNT_DEBUG in
printk and is not needed otherwise. So hide all this stuff
under the PACKET_REFCNT_DEBUG.
Signed-off-by: Pavel Emelyanov <[EMAIL PROTECTED]>
---
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 4cb2dfb..e6a96ee 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -139,8 +139,30 @@ dev->hard_header == NULL (ll header is added by device, we
cannot control it)
static HLIST_HEAD(packet_sklist);
static DEFINE_RWLOCK(packet_sklist_lock);
+#ifdef PACKET_REFCNT_DEBUG
static atomic_t packet_socks_nr;
+static void packet_sock_inc(void)
+{
+ atomic_inc(&packet_socks_nr);
+}
+
+static void packet_sock_dec(void)
+{
+ atomic_dec(&packet_socks_nr);
+ printk(KERN_DEBUG "PACKET socket %p is free, %d are alive\n",
+ sk, atomic_read(&packet_socks_nr));
+}
+#else
+static inline void packet_sock_inc(void)
+{
+}
+
+static inline void packet_sock_dec(void)
+{
+}
+#endif
+
/* Private packet socket structures. */
@@ -236,10 +258,7 @@ static void packet_sock_destruct(struct sock *sk)
return;
}
- atomic_dec(&packet_socks_nr);
-#ifdef PACKET_REFCNT_DEBUG
- printk(KERN_DEBUG "PACKET socket %p is free, %d are alive\n", sk,
atomic_read(&packet_socks_nr));
-#endif
+ packet_sock_dec();
}
@@ -1010,7 +1029,7 @@ static int packet_create(struct net *net, struct socket
*sock, int protocol)
po->num = proto;
sk->sk_destruct = packet_sock_destruct;
- atomic_inc(&packet_socks_nr);
+ packet_sock_inc();
/*
* Attach a protocol block
--
1.5.3.4
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
