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 /include/net/sock.h | |
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 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 2516d76f043c..170353dd9570 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -592,7 +592,7 @@ static inline int sk_stream_memory_free(struct sock *sk) | |||
592 | } | 592 | } |
593 | 593 | ||
594 | /* OOB backlog add */ | 594 | /* OOB backlog add */ |
595 | static inline void sk_add_backlog(struct sock *sk, struct sk_buff *skb) | 595 | static inline void __sk_add_backlog(struct sock *sk, struct sk_buff *skb) |
596 | { | 596 | { |
597 | if (!sk->sk_backlog.tail) { | 597 | if (!sk->sk_backlog.tail) { |
598 | sk->sk_backlog.head = sk->sk_backlog.tail = skb; | 598 | sk->sk_backlog.head = sk->sk_backlog.tail = skb; |
@@ -604,12 +604,12 @@ static inline void sk_add_backlog(struct sock *sk, struct sk_buff *skb) | |||
604 | } | 604 | } |
605 | 605 | ||
606 | /* The per-socket spinlock must be held here. */ | 606 | /* The per-socket spinlock must be held here. */ |
607 | static inline int sk_add_backlog_limited(struct sock *sk, struct sk_buff *skb) | 607 | static inline int sk_add_backlog(struct sock *sk, struct sk_buff *skb) |
608 | { | 608 | { |
609 | if (sk->sk_backlog.len >= max(sk->sk_backlog.limit, sk->sk_rcvbuf << 1)) | 609 | if (sk->sk_backlog.len >= max(sk->sk_backlog.limit, sk->sk_rcvbuf << 1)) |
610 | return -ENOBUFS; | 610 | return -ENOBUFS; |
611 | 611 | ||
612 | sk_add_backlog(sk, skb); | 612 | __sk_add_backlog(sk, skb); |
613 | sk->sk_backlog.len += skb->truesize; | 613 | sk->sk_backlog.len += skb->truesize; |
614 | return 0; | 614 | return 0; |
615 | } | 615 | } |