1 files changed, 4 insertions, 19 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 1a720c86e80a..848be692cb45 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2,7 +2,7 @@
  * net/tipc/socket.c: TIPC socket API
  *
  * Copyright (c) 2001-2007, Ericsson AB
- * Copyright (c) 2004-2008, 2010-2011, Wind River Systems
+ * Copyright (c) 2004-2008, 2010-2012, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -73,8 +73,6 @@ static struct proto tipc_proto;
 
 static int sockets_enabled;
 
-static atomic_t tipc_queue_size = ATOMIC_INIT(0);
-
 /*
  * Revised TIPC socket locking policy:
  *
@@ -128,7 +126,6 @@ static atomic_t tipc_queue_size = ATOMIC_INIT(0);
 static void advance_rx_queue(struct sock *sk)
 {
         kfree_skb(__skb_dequeue(&sk->sk_receive_queue));
-        atomic_dec(&tipc_queue_size);
 }
 
 /**
@@ -140,10 +137,8 @@ static void discard_rx_queue(struct sock *sk)
 {
         struct sk_buff *buf;
 
-        while ((buf = __skb_dequeue(&sk->sk_receive_queue))) {
-                atomic_dec(&tipc_queue_size);
+        while ((buf = __skb_dequeue(&sk->sk_receive_queue)))
                 kfree_skb(buf);
-        }
 }
 
 /**
@@ -155,10 +150,8 @@ static void reject_rx_queue(struct sock *sk)
 {
         struct sk_buff *buf;
 
-        while ((buf = __skb_dequeue(&sk->sk_receive_queue))) {
+        while ((buf = __skb_dequeue(&sk->sk_receive_queue)))
                 tipc_reject_msg(buf, TIPC_ERR_NO_PORT);
-                atomic_dec(&tipc_queue_size);
-        }
 }
 
 /**
@@ -280,7 +273,6 @@ static int release(struct socket *sock)
                 buf = __skb_dequeue(&sk->sk_receive_queue);
                 if (buf == NULL)
                         break;
-                atomic_dec(&tipc_queue_size);
                 if (TIPC_SKB_CB(buf)->handle != 0)
                         kfree_skb(buf);
                 else {
@@ -1241,11 +1233,6 @@ static u32 filter_rcv(struct sock *sk, struct sk_buff *buf)
         }
 
         /* Reject message if there isn't room to queue it */
-        recv_q_len = (u32)atomic_read(&tipc_queue_size);
-        if (unlikely(recv_q_len >= OVERLOAD_LIMIT_BASE)) {
-                if (rx_queue_full(msg, recv_q_len, OVERLOAD_LIMIT_BASE))
-                        return TIPC_ERR_OVERLOAD;
-        }
         recv_q_len = skb_queue_len(&sk->sk_receive_queue);
         if (unlikely(recv_q_len >= (OVERLOAD_LIMIT_BASE / 2))) {
                 if (rx_queue_full(msg, recv_q_len, OVERLOAD_LIMIT_BASE / 2))
@@ -1254,7 +1241,6 @@ static u32 filter_rcv(struct sock *sk, struct sk_buff *buf)
 
         /* Enqueue message (finally!) */
         TIPC_SKB_CB(buf)->handle = 0;
-        atomic_inc(&tipc_queue_size);
         __skb_queue_tail(&sk->sk_receive_queue, buf);
 
         /* Initiate connection termination for an incoming 'FIN' */
@@ -1578,7 +1564,6 @@ restart:
                 /* Disconnect and send a 'FIN+' or 'FIN-' message to peer */
                 buf = __skb_dequeue(&sk->sk_receive_queue);
                 if (buf) {
-                        atomic_dec(&tipc_queue_size);
                         if (TIPC_SKB_CB(buf)->handle != 0) {
                                 kfree_skb(buf);
                                 goto restart;
@@ -1717,7 +1702,7 @@ static int getsockopt(struct socket *sock,
                 /* no need to set "res", since already 0 at this point */
                 break;
         case TIPC_NODE_RECVQ_DEPTH:
-                value = (u32)atomic_read(&tipc_queue_size);
+                value = 0; /* was tipc_queue_size, now obsolete */
                 break;
         case TIPC_SOCK_RECVQ_DEPTH:
                 value = skb_queue_len(&sk->sk_receive_queue);