diff options
author | Zhu Yi <yi.zhu@intel.com> | 2010-03-04 13:01:47 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 19:02:04 -0400 |
commit | a12a9a26ff389892df27e2ff4cbf03e5b2ed0d64 (patch) | |
tree | 365926473d8d9879f3b146e23668afee89b9b47d /net/core/sock.c | |
parent | 51c5db4ddd330e96c9221392b1cf361ce1daa88c (diff) |
net: backlog functions rename
[ Upstream commit a3a858ff18a72a8d388e31ab0d98f7e944841a62 ]
sk_add_backlog -> __sk_add_backlog
sk_add_backlog_limited -> sk_add_backlog
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/core/sock.c')
-rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 385d26210818..5779f315919f 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -340,7 +340,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested) | |||
340 | rc = sk_backlog_rcv(sk, skb); | 340 | rc = sk_backlog_rcv(sk, skb); |
341 | 341 | ||
342 | mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_); | 342 | mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_); |
343 | } else if (sk_add_backlog_limited(sk, skb)) { | 343 | } else if (sk_add_backlog(sk, skb)) { |
344 | bh_unlock_sock(sk); | 344 | bh_unlock_sock(sk); |
345 | atomic_inc(&sk->sk_drops); | 345 | atomic_inc(&sk->sk_drops); |
346 | goto discard_and_relse; | 346 | goto discard_and_relse; |