net: wrap sk->sk_backlog_rcv()

Wrap calling sk->sk_backlog_rcv() in a function. This will allow extending the
generic sk_backlog_rcv behaviour.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 10 insertions, 5 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index 18f96708f3a6..ada50c04d09f 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -482,6 +482,11 @@ static inline void sk_add_backlog(struct sock *sk, struct sk_buff *skb)
         skb->next = NULL;
 }
 
+static inline int sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)
+{
+        return sk->sk_backlog_rcv(sk, skb);
+}
+
 #define sk_wait_event(__sk, __timeo, __condition)                       \
         ({      int __rc;                                               \
                 release_sock(__sk);                                     \
diff --git a/include/net/tcp.h b/include/net/tcp.h
index f6cc34143154..438014d57610 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -896,7 +896,7 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb)
                         BUG_ON(sock_owned_by_user(sk));
 
                         while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) {
-                                sk->sk_backlog_rcv(sk, skb1);
+                                sk_backlog_rcv(sk, skb1);
                                 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPPREQUEUEDROPPED);
                         }
 
diff --git a/net/core/sock.c b/net/core/sock.c
index 2d358dd8a03e..5e2a3132a8c9 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -327,7 +327,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
                  */
                 mutex_acquire(&sk->sk_lock.dep_map, 0, 1, _RET_IP_);
 
-                rc = sk->sk_backlog_rcv(sk, skb);
+                rc = sk_backlog_rcv(sk, skb);
 
                 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
         } else
@@ -1374,7 +1374,7 @@ static void __release_sock(struct sock *sk)
                         struct sk_buff *next = skb->next;
 
                         skb->next = NULL;
-                        sk->sk_backlog_rcv(sk, skb);
+                        sk_backlog_rcv(sk, skb);
 
                         /*
                          * We are in process context here with softirqs
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 7d81a1ee5507..7d3fe571d15f 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1161,7 +1161,7 @@ static void tcp_prequeue_process(struct sock *sk)
          * necessary */
         local_bh_disable();
         while ((skb = __skb_dequeue(&tp->ucopy.prequeue)) != NULL)
-                sk->sk_backlog_rcv(sk, skb);
+                sk_backlog_rcv(sk, skb);
         local_bh_enable();
 
         /* Clear memory counter. */
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 5ab6ba19c3ce..6b6dff1164b9 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -201,7 +201,7 @@ static void tcp_delack_timer(unsigned long data)
                 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPSCHEDULERFAILED);
 
                 while ((skb = __skb_dequeue(&tp->ucopy.prequeue)) != NULL)
-                        sk->sk_backlog_rcv(sk, skb);
+                        sk_backlog_rcv(sk, skb);
 
                 tp->ucopy.memory = 0;
         }