[PATCH 04/31] netfilter: Auto-load ip_queue module when socket opened.

[PATCH 04/31] netfilter: Auto-load ip_queue module when socket opened.

[Scott James Remnant]

The ip_queue module is missing the net-pf-16-proto-3 alias that would
causae it to be auto-loaded when a socket of that type is opened.  This
patch adds the alias.

Signed-off-by: Scott James Remnant <scott@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 net/ipv4/netfilter/ip_queue.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index 432ce9d..5f22c91 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/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);
-- 
1.6.0.5

[PATCH 05/31] netfilter: Auto-load ip6_queue module when socket opened.

[Scott James Remnant]

The ip6_queue module is missing the net-pf-16-proto-13 alias that would
cause it to be auto-loaded when a socket of that type is opened.  This
patch adds the alias.

Signed-off-by: Scott James Remnant <scott@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 net/ipv6/netfilter/ip6_queue.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index 5859c04..b693f84 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -643,6 +643,7 @@ static void __exit ip6_queue_fini(void)
 
 MODULE_DESCRIPTION("IPv6 packet queue handler");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_IP6_FW);
 
 module_init(ip6_queue_init);
 module_exit(ip6_queue_fini);
-- 
1.6.0.5

Re: [PATCH 05/31] netfilter: Auto-load ip6_queue module when socket opened.

[Patrick McHardy]

Scott James Remnant wrote:
> The ip6_queue module is missing the net-pf-16-proto-13 alias that would
> cause it to be auto-loaded when a socket of that type is opened.  This
> patch adds the alias.

Applied, thanks.

Re: [PATCH 04/31] netfilter: Auto-load ip_queue module when socket opened.

[Patrick McHardy]

Scott James Remnant wrote:
> The ip_queue module is missing the net-pf-16-proto-3 alias that would
> causae it to be auto-loaded when a socket of that type is opened.  This
> patch adds the alias.

Also applied, thanks.