[SOCK]: Introduce sk_receive_skb

Its common enough to to justify that, TCP still can't use it as it has the
prequeueing stuff, still to be made generic in the not so distant future :-)

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 4 insertions, 53 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index c363051a7f16..99e8afa7ba1e 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -914,7 +914,6 @@ int dccp_v4_rcv(struct sk_buff *skb)
 {
         const struct dccp_hdr *dh;
         struct sock *sk;
-        int rc;
 
         /* Step 1: Check header basics: */
 
@@ -984,28 +983,10 @@ int dccp_v4_rcv(struct sk_buff *skb)
                 goto do_time_wait;
         }
 
-        if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
-                dccp_pr_debug("xfrm4_policy_check failed\n");
+        if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
                 goto discard_and_relse;
-        }
-
-        if (sk_filter(sk, skb, 0)) {
-                dccp_pr_debug("sk_filter failed\n");
-                goto discard_and_relse;
-        }
-
-        skb->dev = NULL;
 
-        bh_lock_sock(sk);
-        rc = 0;
-        if (!sock_owned_by_user(sk))
-                rc = dccp_v4_do_rcv(sk, skb);
-        else
-                sk_add_backlog(sk, skb);
-        bh_unlock_sock(sk);
-
-        sock_put(sk);
-        return rc;
+        return sk_receive_skb(sk, skb);
 
 no_dccp_socket:
         if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 599b0be21515..2e194c8f9953 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -1032,7 +1032,6 @@ static int dccp_v6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
         const struct dccp_hdr *dh;
         struct sk_buff *skb = *pskb;
         struct sock *sk;
-        int rc;
 
         /* Step 1: Check header basics: */
 
@@ -1077,21 +1076,7 @@ static int dccp_v6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
         if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
                 goto discard_and_relse;
 
-        if (sk_filter(sk, skb, 0))
-                goto discard_and_relse;
-
-        skb->dev = NULL;
-
-        bh_lock_sock(sk);
-        rc = 0;
-        if (!sock_owned_by_user(sk))
-                rc = dccp_v6_do_rcv(sk, skb);
-        else
-                sk_add_backlog(sk, skb);
-        bh_unlock_sock(sk);
-
-        sock_put(sk);
-        return rc ? -1 : 0;
+        return sk_receive_skb(sk, skb) ? -1 : 0;
 
 no_dccp_socket:
         if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c
index 369f25b60f3f..44bda85e678f 100644
--- a/net/decnet/dn_nsp_in.c
+++ b/net/decnet/dn_nsp_in.c
@@ -793,7 +793,6 @@ static int dn_nsp_rx_packet(struct sk_buff *skb)
 got_it:
         if (sk != NULL) {
                 struct dn_scp *scp = DN_SK(sk);
-                int ret;
 
                 /* Reset backoff */
                 scp->nsp_rxtshift = 0;
@@ -807,21 +806,7 @@ got_it:
                                 goto free_out;
                 }
 
-                bh_lock_sock(sk);
-                ret = NET_RX_SUCCESS;
-                if (decnet_debug_level & 8)
-                        printk(KERN_DEBUG "NSP: 0x%02x 0x%02x 0x%04x 0x%04x %d\n",
-                                (int)cb->rt_flags, (int)cb->nsp_flags, 
-                                (int)cb->src_port, (int)cb->dst_port, 
-                                !!sock_owned_by_user(sk));
-                if (!sock_owned_by_user(sk))
-                        ret = dn_nsp_backlog_rcv(sk, skb);
-                else
-                        sk_add_backlog(sk, skb);
-                bh_unlock_sock(sk);
-                sock_put(sk);
-
-                return ret;
+                return sk_receive_skb(sk, skb);
         }
 
         return dn_nsp_no_socket(skb, reason);