diff options
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_netlink.c | 6 | ||||
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c index ef84f43f07..a20b0e385f 100644 --- a/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/net/ipv4/netfilter/ip_conntrack_netlink.c | |||
| @@ -329,11 +329,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, | |||
| 329 | /* dump everything */ | 329 | /* dump everything */ |
| 330 | events = ~0UL; | 330 | events = ~0UL; |
| 331 | group = NFNLGRP_CONNTRACK_NEW; | 331 | group = NFNLGRP_CONNTRACK_NEW; |
| 332 | } else if (events & (IPCT_STATUS | | 332 | } else if (events & (IPCT_STATUS | IPCT_PROTOINFO)) { |
| 333 | IPCT_PROTOINFO | | ||
| 334 | IPCT_HELPER | | ||
| 335 | IPCT_HELPINFO | | ||
| 336 | IPCT_NATINFO)) { | ||
| 337 | type = IPCTNL_MSG_CT_NEW; | 333 | type = IPCTNL_MSG_CT_NEW; |
| 338 | group = NFNLGRP_CONNTRACK_UPDATE; | 334 | group = NFNLGRP_CONNTRACK_UPDATE; |
| 339 | } else | 335 | } else |
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index dc4f081dca..8cd85cfd9a 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
| @@ -339,11 +339,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, | |||
| 339 | /* dump everything */ | 339 | /* dump everything */ |
| 340 | events = ~0UL; | 340 | events = ~0UL; |
| 341 | group = NFNLGRP_CONNTRACK_NEW; | 341 | group = NFNLGRP_CONNTRACK_NEW; |
| 342 | } else if (events & (IPCT_STATUS | | 342 | } else if (events & (IPCT_STATUS | IPCT_PROTOINFO)) { |
| 343 | IPCT_PROTOINFO | | ||
| 344 | IPCT_HELPER | | ||
| 345 | IPCT_HELPINFO | | ||
| 346 | IPCT_NATINFO)) { | ||
| 347 | type = IPCTNL_MSG_CT_NEW; | 343 | type = IPCTNL_MSG_CT_NEW; |
| 348 | group = NFNLGRP_CONNTRACK_UPDATE; | 344 | group = NFNLGRP_CONNTRACK_UPDATE; |
| 349 | } else | 345 | } else |