[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, 1 insertions, 14 deletions

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 82baea026484..13d74598d3e4 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -603,7 +603,6 @@ static void icmp_unreach(struct sk_buff *skb)
         struct icmphdr *icmph;
         int hash, protocol;
         struct net_protocol *ipprot;
-        struct sock *raw_sk;
         u32 info = 0;
 
         /*
@@ -697,21 +696,9 @@ static void icmp_unreach(struct sk_buff *skb)
         /*
          *      Deliver ICMP message to raw sockets. Pretty useless feature?
          */
+        raw_icmp_error(skb, protocol, info);
 
-        /* Note: See raw.c and net/raw.h, RAWV4_HTABLE_SIZE==MAX_INET_PROTOS */
         hash = protocol & (MAX_INET_PROTOS - 1);
-        read_lock(&raw_v4_lock);
-        if ((raw_sk = sk_head(&raw_v4_htable[hash])) != NULL) {
-                while ((raw_sk = __raw_v4_lookup(raw_sk, protocol, iph->daddr,
-                                                 iph->saddr,
-                                                 skb->dev->ifindex)) != NULL) {
-                        raw_err(raw_sk, skb, info);
-                        raw_sk = sk_next(raw_sk);
-                        iph = (struct iphdr *)skb->data;
-                }
-        }
-        read_unlock(&raw_v4_lock);
-
         rcu_read_lock();
         ipprot = rcu_dereference(inet_protos[hash]);
         if (ipprot && ipprot->err_handler)