aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2007-03-23 14:17:57 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:27:46 -0400
commitc7bf5f9dc2f78ae8ebbfffc5f17becd0d9e6ba9e (patch)
treec94efc41913627b110c4e80ee5bea65ae67a602c
parentde6e05c49f8b4ed63224c5d38891f531ecc4eabb (diff)
[NETFILTER] nfnetlink: netlink_run_queue() already checks for NLM_F_REQUEST
Patrick has made use of netlink_run_queue() in nfnetlink while my patches have been waiting for net-2.6.22 to open. So this check for NLM_F_REQUEST can go as well. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/netfilter/nfnetlink.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index c37ed0156b07..b0da853eabe0 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -204,10 +204,6 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
204 if (security_netlink_recv(skb, CAP_NET_ADMIN)) 204 if (security_netlink_recv(skb, CAP_NET_ADMIN))
205 return -EPERM; 205 return -EPERM;
206 206
207 /* Only requests are handled by kernel now. */
208 if (!(nlh->nlmsg_flags & NLM_F_REQUEST))
209 return 0;
210
211 /* All the messages must at least contain nfgenmsg */ 207 /* All the messages must at least contain nfgenmsg */
212 if (nlh->nlmsg_len < NLMSG_SPACE(sizeof(struct nfgenmsg))) 208 if (nlh->nlmsg_len < NLMSG_SPACE(sizeof(struct nfgenmsg)))
213 return 0; 209 return 0;