[NETLINK]: Ignore control messages directly in netlink_run_queue()

[net-next-2.6.git] / net / netlink / genetlink.c

diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index c2996794eb25c0c939dcd52ae594e0727322e654..95391e609046841eb88e2b16df193594d4b1d09a 100644 (file)
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -304,12 +304,6 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
        struct genlmsghdr *hdr = nlmsg_data(nlh);
        int hdrlen, err = -EINVAL;
 
-       if (!(nlh->nlmsg_flags & NLM_F_REQUEST))
-               goto ignore;
-
-       if (nlh->nlmsg_type < NLMSG_MIN_TYPE)
-               goto ignore;
-
        family = genl_family_find_byid(nlh->nlmsg_type);
        if (family == NULL) {
                err = -ENOENT;
@@ -367,9 +361,6 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
        *errp = err = ops->doit(skb, &info);
        return err;
 
-ignore:
-       return 0;
-
 errout:
        *errp = err;
        return -1;