net: raw: revert unrelated change

Commit 5640f7685831 ("net: use a per task frag allocator")
accidentally contained an unrelated change to net/ipv4/raw.c,
later committed (without the pr_err() debugging bits) in
net tree as commit ab43ed8b749 (ipv4: raw: fix icmp_filter())

This patch reverts this glitch, noticed by Stephen Rothwell.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index a80740ba4248d05f815fde65ef46b06bfac0d614..f2425785d40a241583fe5944b2f72f87f5d94fdb 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -131,23 +131,18 @@ found:
  *     0 - deliver
  *     1 - block
  */
-static int icmp_filter(const struct sock *sk, const struct sk_buff *skb)
+static __inline__ int icmp_filter(struct sock *sk, struct sk_buff *skb)
 {
-       struct icmphdr _hdr;
-       const struct icmphdr *hdr;
-
-       pr_err("icmp_filter skb_transport_offset %d data-head %ld len %d/%d\n",
-               skb_transport_offset(skb), skb->data - skb->head, skb->len, skb->data_len);
-       hdr = skb_header_pointer(skb, skb_transport_offset(skb),
-                                sizeof(_hdr), &_hdr);
-       pr_err("head %p data %p hdr %p type %d\n", skb->head, skb->data, hdr, hdr ? hdr->type : -1);
-       if (!hdr)
+       int type;
+
+       if (!pskb_may_pull(skb, sizeof(struct icmphdr)))
                return 1;
 
-       if (hdr->type < 32) {
+       type = icmp_hdr(skb)->type;
+       if (type < 32) {
                __u32 data = raw_sk(sk)->filter.data;
 
-               return ((1U << hdr->type) & data) != 0;
+               return ((1 << type) & data) != 0;
        }
 
        /* Do not block unknown ICMP types */