[IPv4] RAW: Compact the API for the kernel

The raw sockets functions are explicitly used from
inside the kernel in two places:

1. in ip_local_deliver_finish to intercept skb-s
2. in icmp_error

For this purposes many functions and even data structures,
that are naturally internal for raw protocol, are exported.

Compact the API to two functions and hide all the other
(including hash table and rwlock) inside the net/ipv4/raw.c

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 12 deletions

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 4068e178d747..65631391d479 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -204,22 +204,14 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
 
         rcu_read_lock();
         {
-                /* Note: See raw.c and net/raw.h, RAWV4_HTABLE_SIZE==MAX_INET_PROTOS */
                 int protocol = ip_hdr(skb)->protocol;
-                int hash;
-                struct sock *raw_sk;
+                int hash, raw;
                 struct net_protocol *ipprot;
 
         resubmit:
-                hash = protocol & (MAX_INET_PROTOS - 1);
-                raw_sk = sk_head(&raw_v4_htable[hash]);
-
-                /* If there maybe a raw socket we must check - if not we
-                 * don't care less
-                 */
-                if (raw_sk && !raw_v4_input(skb, ip_hdr(skb), hash))
-                        raw_sk = NULL;
+                raw = raw_local_deliver(skb, protocol);
 
+                hash = protocol & (MAX_INET_PROTOS - 1);
                 if ((ipprot = rcu_dereference(inet_protos[hash])) != NULL) {
                         int ret;
 
@@ -237,7 +229,7 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
                         }
                         IP_INC_STATS_BH(IPSTATS_MIB_INDELIVERS);
                 } else {
-                        if (!raw_sk) {
+                        if (!raw) {
                                 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
                                         IP_INC_STATS_BH(IPSTATS_MIB_INUNKNOWNPROTOS);
                                         icmp_send(skb, ICMP_DEST_UNREACH,