diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-11 20:00:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-11 20:00:44 -0700 |
| commit | adf76cfe24dab32a54e2dd1f51534cea8277f32a (patch) | |
| tree | 6935c74a4b7237bd5f95918b3145ac57e0769fca /net/ipv4/netfilter/ip_queue.c | |
| parent | 17d0cdfa8f3c09a110061c67421d662b3e149d0a (diff) | |
| parent | 24992eacd8a9f4af286bdaaab627b6802ceb8bce (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv4/netfilter/ip_queue.c')
| -rw-r--r-- | net/ipv4/netfilter/ip_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c index 5f22c91c6e1..c156db21598 100644 --- a/net/ipv4/netfilter/ip_queue.c +++ b/net/ipv4/netfilter/ip_queue.c @@ -596,7 +596,7 @@ static int __init ip_queue_init(void) #ifdef CONFIG_SYSCTL ipq_sysctl_header = register_sysctl_paths(net_ipv4_ctl_path, ipq_table); #endif - status = nf_register_queue_handler(PF_INET, &nfqh); + status = nf_register_queue_handler(NFPROTO_IPV4, &nfqh); if (status < 0) { printk(KERN_ERR "ip_queue: failed to register queue handler\n"); goto cleanup_sysctl; |