From 5dd7df6788d0019d1765cd4e7b2dcc5810ffa116 Mon Sep 17 00:00:00 2001
From: Scott James Remnant <scott@canonical.com>
Date: Mon, 16 Mar 2009 15:31:10 +0100
Subject: [PATCH] --- yaml --- r: 135497 b: refs/heads/master c:
 95ba434f898c3cb5c7457dce265bf0ab72ba8ce9 h: refs/heads/master i:   135495:
 29cea483ac55a35eaa2e1f91bf52c40560776197 v: v3

---
 [refs]                              | 2 +-
 trunk/net/ipv4/netfilter/ip_queue.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 23f84c44c392..7b2194f34196 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26c3b6780618f09abb5f7e03b09b13dbb8e8aa24
+refs/heads/master: 95ba434f898c3cb5c7457dce265bf0ab72ba8ce9
diff --git a/trunk/net/ipv4/netfilter/ip_queue.c b/trunk/net/ipv4/netfilter/ip_queue.c
index 432ce9d1c11c..5f22c91c6e15 100644
--- a/trunk/net/ipv4/netfilter/ip_queue.c
+++ b/trunk/net/ipv4/netfilter/ip_queue.c
@@ -24,6 +24,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/security.h>
+#include <linux/net.h>
 #include <linux/mutex.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
@@ -640,6 +641,7 @@ static void __exit ip_queue_fini(void)
 MODULE_DESCRIPTION("IPv4 packet queue handler");
 MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_FIREWALL);
 
 module_init(ip_queue_init);
 module_exit(ip_queue_fini);