This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / ipv4 / raw.c

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index d36280a..3fe4f40 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -131,9 +131,6 @@ static __inline__ int icmp_filter(struct sock *sk, struct sk_buff *skb)
 {
        int type;
 
-       if (!pskb_may_pull(skb, sizeof(struct icmphdr)))
-               return 1;
-
        type = skb->h.icmph->type;
        if (type < 32) {
                __u32 data = raw4_sk(sk)->filter.data;
@@ -411,7 +408,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                                printk(KERN_INFO "%s forgot to set AF_INET in "
                                                 "raw sendmsg. Fix it!\n",
                                                 current->comm);
-                       err = -EAFNOSUPPORT;
+                       err = -EINVAL;
                        if (usin->sin_family)
                                goto out;
                }
@@ -710,7 +707,6 @@ static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg)
 
 struct proto raw_prot = {
        .name =         "RAW",
-       .owner =        THIS_MODULE,
        .close =        raw_close,
        .connect =      ip4_datagram_connect,
        .disconnect =   udp_disconnect,