diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-18 15:40:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-19 16:34:20 -0500 |
commit | b8f3ab4290f1e720166e888ea2a1d1d44c4d15dd (patch) | |
tree | 88d5b71b27ed9ca0b5d67bd6ae61f592fb61fdc5 /net/netfilter/nf_conntrack_netlink.c | |
parent | ff76015f3bdfbc482c723cb4f2559cef84d178ca (diff) |
Revert "netlink: test for all flags of the NLM_F_DUMP composite"
This reverts commit 0ab03c2b1478f2438d2c80204f7fef65b1bca9cf.
It breaks several things including the avahi daemon.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 2b7eef37875..93297aaceb2 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
@@ -924,7 +924,7 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb, | |||
924 | u16 zone; | 924 | u16 zone; |
925 | int err; | 925 | int err; |
926 | 926 | ||
927 | if ((nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP) | 927 | if (nlh->nlmsg_flags & NLM_F_DUMP) |
928 | return netlink_dump_start(ctnl, skb, nlh, ctnetlink_dump_table, | 928 | return netlink_dump_start(ctnl, skb, nlh, ctnetlink_dump_table, |
929 | ctnetlink_done); | 929 | ctnetlink_done); |
930 | 930 | ||
@@ -1787,7 +1787,7 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb, | |||
1787 | u16 zone; | 1787 | u16 zone; |
1788 | int err; | 1788 | int err; |
1789 | 1789 | ||
1790 | if ((nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP) { | 1790 | if (nlh->nlmsg_flags & NLM_F_DUMP) { |
1791 | return netlink_dump_start(ctnl, skb, nlh, | 1791 | return netlink_dump_start(ctnl, skb, nlh, |
1792 | ctnetlink_exp_dump_table, | 1792 | ctnetlink_exp_dump_table, |
1793 | ctnetlink_exp_done); | 1793 | ctnetlink_exp_done); |