diff options
author | Zhu Yi <yi.zhu@intel.com> | 2010-03-04 13:01:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-05 16:34:03 -0500 |
commit | a3a858ff18a72a8d388e31ab0d98f7e944841a62 (patch) | |
tree | e51a59ce280f0aa818ac5e1d989bc8a137b7cd47 /net/ipv6 | |
parent | 2499849ee8f513e795b9f2c19a42d6356e4943a4 (diff) |
net: backlog functions rename
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>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 | ||||
-rw-r--r-- | net/ipv6/udp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index c4ea9d5cbfaa..2c378b1bd5cf 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1740,7 +1740,7 @@ process: | |||
1740 | if (!tcp_prequeue(sk, skb)) | 1740 | if (!tcp_prequeue(sk, skb)) |
1741 | ret = tcp_v6_do_rcv(sk, skb); | 1741 | ret = tcp_v6_do_rcv(sk, skb); |
1742 | } | 1742 | } |
1743 | } else if (sk_add_backlog_limited(sk, skb)) { | 1743 | } else if (sk_add_backlog(sk, skb)) { |
1744 | bh_unlock_sock(sk); | 1744 | bh_unlock_sock(sk); |
1745 | goto discard_and_relse; | 1745 | goto discard_and_relse; |
1746 | } | 1746 | } |
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 64804912b093..3c0c9c755c92 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -583,7 +583,7 @@ static void flush_stack(struct sock **stack, unsigned int count, | |||
583 | bh_lock_sock(sk); | 583 | bh_lock_sock(sk); |
584 | if (!sock_owned_by_user(sk)) | 584 | if (!sock_owned_by_user(sk)) |
585 | udpv6_queue_rcv_skb(sk, skb1); | 585 | udpv6_queue_rcv_skb(sk, skb1); |
586 | else if (sk_add_backlog_limited(sk, skb1)) { | 586 | else if (sk_add_backlog(sk, skb1)) { |
587 | kfree_skb(skb1); | 587 | kfree_skb(skb1); |
588 | bh_unlock_sock(sk); | 588 | bh_unlock_sock(sk); |
589 | goto drop; | 589 | goto drop; |
@@ -758,7 +758,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, | |||
758 | bh_lock_sock(sk); | 758 | bh_lock_sock(sk); |
759 | if (!sock_owned_by_user(sk)) | 759 | if (!sock_owned_by_user(sk)) |
760 | udpv6_queue_rcv_skb(sk, skb); | 760 | udpv6_queue_rcv_skb(sk, skb); |
761 | else if (sk_add_backlog_limited(sk, skb)) { | 761 | else if (sk_add_backlog(sk, skb)) { |
762 | atomic_inc(&sk->sk_drops); | 762 | atomic_inc(&sk->sk_drops); |
763 | bh_unlock_sock(sk); | 763 | bh_unlock_sock(sk); |
764 | sock_put(sk); | 764 | sock_put(sk); |