diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-03 13:23:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-03 13:23:12 -0800 |
| commit | 424eff975192553a9ea8bfd51bf65039ffb356ef (patch) | |
| tree | 5fa7b15715b3ce904f7250c50d09bc921d9f28bf /net/netfilter/nfnetlink_log.c | |
| parent | 55dbabee63462a455d8fb57caf08b69db256b012 (diff) | |
| parent | 3666ed1c4837fd6906da0224c5373d7a2186a193 (diff) | |
| download | linux-stable-424eff975192553a9ea8bfd51bf65039ffb356ef.tar.gz linux-stable-424eff975192553a9ea8bfd51bf65039ffb356ef.tar.bz2 linux-stable-424eff975192553a9ea8bfd51bf65039ffb356ef.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/netfilter/nfnetlink_log.c')
| -rw-r--r-- | net/netfilter/nfnetlink_log.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index 49005482e39a..9de0470d557e 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -666,8 +666,7 @@ nfulnl_rcv_nl_event(struct notifier_block *this, { struct netlink_notify *n = ptr; - if (event == NETLINK_URELEASE && - n->protocol == NETLINK_NETFILTER && n->pid) { + if (event == NETLINK_URELEASE && n->protocol == NETLINK_NETFILTER) { int i; /* destroy all instances for this pid */ |