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>

diff --git a/include/net/sock.h b/include/net/sock.h
index cd0b34a4f2b94031604ae23f1fd34a2c872491cc..01eedfd3e1e32e2920b2fefe9beb6c067257673e 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -577,7 +577,7 @@ static inline int sk_stream_memory_free(struct sock *sk)
 }
 
 /* OOB backlog add */
-static inline void sk_add_backlog(struct sock *sk, struct sk_buff *skb)
+static inline void __sk_add_backlog(struct sock *sk, struct sk_buff *skb)
 {
        if (!sk->sk_backlog.tail) {
                sk->sk_backlog.head = sk->sk_backlog.tail = skb;
@@ -589,12 +589,12 @@ static inline void sk_add_backlog(struct sock *sk, struct sk_buff *skb)
 }
 
 /* The per-socket spinlock must be held here. */
-static inline int sk_add_backlog_limited(struct sock *sk, struct sk_buff *skb)
+static inline int sk_add_backlog(struct sock *sk, struct sk_buff *skb)
 {
        if (sk->sk_backlog.len >= max(sk->sk_backlog.limit, sk->sk_rcvbuf << 1))
                return -ENOBUFS;
 
-       sk_add_backlog(sk, skb);
+       __sk_add_backlog(sk, skb);
        sk->sk_backlog.len += skb->truesize;
        return 0;
 }

diff --git a/net/core/sock.c b/net/core/sock.c
index 385d26210818b921e64d82a042e4f22df9af4894..5779f315919fdc5efd315d47dcc882b3e7893c06 100644 (file)
--- 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)
                rc = sk_backlog_rcv(sk, skb);
 
                mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
-       } else if (sk_add_backlog_limited(sk, skb)) {
+       } else if (sk_add_backlog(sk, skb)) {
                bh_unlock_sock(sk);
                atomic_inc(&sk->sk_drops);
                goto discard_and_relse;

diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index af226a063141dc936ab558b6b5243bcdbcef37a7..0d508c359fa97f053831f15a76ea764236ca9887 100644 (file)
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -254,7 +254,7 @@ int dccp_child_process(struct sock *parent, struct sock *child,
                 * in main socket hash table and lock on listening
                 * socket does not protect us more.
                 */
-               sk_add_backlog(child, skb);
+               __sk_add_backlog(child, skb);
        }
 
        bh_unlock_sock(child);

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index febfe1586e198a7b1f3df4260d25562d84c490d3..de935e3914437c5b2d0f4eec3976c5fdf2df248b 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1677,7 +1677,7 @@ process:
                        if (!tcp_prequeue(sk, skb))
                                ret = tcp_v4_do_rcv(sk, skb);
                }
-       } else if (sk_add_backlog_limited(sk, skb)) {
+       } else if (sk_add_backlog(sk, skb)) {
                bh_unlock_sock(sk);
                goto discard_and_relse;
        }

diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index f206ee5dda80b4e8c29f6576276bb1452e09c53e..4199bc6915c549231f481aeef9f3f7fd1f435464 100644 (file)
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -728,7 +728,7 @@ int tcp_child_process(struct sock *parent, struct sock *child,
                 * in main socket hash table and lock on listening
                 * socket does not protect us more.
                 */
-               sk_add_backlog(child, skb);
+               __sk_add_backlog(child, skb);
        }
 
        bh_unlock_sock(child);

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 7bb45686f3c57447703a4c8a709055f2253a86b4..112c61135f92f83d139499d15a2b7945866cb1b8 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1372,7 +1372,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
        bh_lock_sock(sk);
        if (!sock_owned_by_user(sk))
                rc = __udp_queue_rcv_skb(sk, skb);
-       else if (sk_add_backlog_limited(sk, skb)) {
+       else if (sk_add_backlog(sk, skb)) {
                bh_unlock_sock(sk);
                goto drop;
        }

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index d89f405528c25ce46488a6756882f59a27265f23..548a06e66b4e0f5715bf9e2474e428bc33c3d5fa 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1732,7 +1732,7 @@ process:
                        if (!tcp_prequeue(sk, skb))
                                ret = tcp_v6_do_rcv(sk, skb);
                }
-       } else if (sk_add_backlog_limited(sk, skb)) {
+       } else if (sk_add_backlog(sk, skb)) {
                bh_unlock_sock(sk);
                goto discard_and_relse;
        }

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index bf88ce073d268f8fe999cef594212ca0316cc6f5..d9714d20705d099302951ed98a29bd31fa6555d7 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -584,7 +584,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
                        bh_lock_sock(sk);
                        if (!sock_owned_by_user(sk))
                                udpv6_queue_rcv_skb(sk, skb1);
-                       else if (sk_add_backlog_limited(sk, skb1)) {
+                       else if (sk_add_backlog(sk, skb1)) {
                                kfree_skb(skb1);
                                bh_unlock_sock(sk);
                                goto drop;
@@ -760,7 +760,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
        bh_lock_sock(sk);
        if (!sock_owned_by_user(sk))
                udpv6_queue_rcv_skb(sk, skb);
-       else if (sk_add_backlog_limited(sk, skb)) {
+       else if (sk_add_backlog(sk, skb)) {
                atomic_inc(&sk->sk_drops);
                bh_unlock_sock(sk);
                sock_put(sk);

diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c
index 019c780512e8f584795f936594c743044c08bf99..86d6985b9d49790e9e4ec5302602b0ef8c025130 100644 (file)
--- a/net/llc/llc_c_ac.c
+++ b/net/llc/llc_c_ac.c
@@ -1437,7 +1437,7 @@ static void llc_process_tmr_ev(struct sock *sk, struct sk_buff *skb)
                        llc_conn_state_process(sk, skb);
                else {
                        llc_set_backlog_type(skb, LLC_EVENT);
-                       sk_add_backlog(sk, skb);
+                       __sk_add_backlog(sk, skb);
                }
        }
 }

diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index 8f97546726b34657c911740475bb0882289a4b1f..c61ca885794d58a47e90d7e0f77ef2f41fcd86e9 100644 (file)
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -756,7 +756,7 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)
        else {
                dprintk("%s: adding to backlog...\n", __func__);
                llc_set_backlog_type(skb, LLC_PACKET);
-               if (sk_add_backlog_limited(sk, skb))
+               if (sk_add_backlog(sk, skb))
                        goto drop_unlock;
        }
 out:

diff --git a/net/sctp/input.c b/net/sctp/input.c
index cbc063665e6b26c985df673aee508a5f70390f24..3d74b264ea2256442eb336e1e333269b8cdbe128 100644 (file)
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -341,7 +341,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb)
                sctp_bh_lock_sock(sk);
 
                if (sock_owned_by_user(sk)) {
-                       if (sk_add_backlog_limited(sk, skb))
+                       if (sk_add_backlog(sk, skb))
                                sctp_chunk_free(chunk);
                        else
                                backloged = 1;
@@ -375,7 +375,7 @@ static int sctp_add_backlog(struct sock *sk, struct sk_buff *skb)
        struct sctp_ep_common *rcvr = chunk->rcvr;
        int ret;
 
-       ret = sk_add_backlog_limited(sk, skb);
+       ret = sk_add_backlog(sk, skb);
        if (!ret) {
                /* Hold the assoc/ep while hanging on the backlog queue.
                 * This way, we know structures we need will not disappear

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 22bfbc33a8aced869acc13ab60fa3886733c3cde..4b235fc1c70ff7948c372a6c0d36e7ca9b5ad39a 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1322,7 +1322,7 @@ static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf)
        if (!sock_owned_by_user(sk)) {
                res = filter_rcv(sk, buf);
        } else {
-               if (sk_add_backlog_limited(sk, buf))
+               if (sk_add_backlog(sk, buf))
                        res = TIPC_ERR_OVERLOAD;
                else
                        res = TIPC_OK;

diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index a9da0dc26f4fad2a2be6d590f8d2e1d49e063bc8..52e304212241055b32bf382960308afd5fea8079 100644 (file)
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -53,7 +53,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
                if (!sock_owned_by_user(sk)) {
                        queued = x25_process_rx_frame(sk, skb);
                } else {
-                       queued = !sk_add_backlog_limited(sk, skb);
+                       queued = !sk_add_backlog(sk, skb);
                }
                bh_unlock_sock(sk);
                sock_put(sk);