af_bus Kconfig dependancy fix patch added

2 files changed, 68 insertions, 1 deletions

diff --git a/patches.af_bus/af_bus-make-netfilter_dbus-depend-on-netfilter.patch b/patches.af_bus/af_bus-make-netfilter_dbus-depend-on-netfilter.patch
new file mode 100644
index 00000000000000..c10f3db4f6d569
--- /dev/null
+++ b/patches.af_bus/af_bus-make-netfilter_dbus-depend-on-netfilter.patch
@@ -0,0 +1,67 @@
+From javier.martinez@collabora.co.uk Thu Jan 24 00:08:10 2013
+From: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
+Date: Thu, 24 Jan 2013 09:07:53 +0100
+Subject: af_bus: make NETFILTER_DBUS depend on NETFILTER
+To: Greg KH <gregkh@linuxfoundation.org>
+Cc: ltsi-dev@lists.linuxfoundation.org, Stephen Lawrence <stephen.lawrence@renesas.com>, Jeremiah Foster <jeremiah.foster@pelagicore.com>, Javier Martinez Canillas <javier.martinez@collabora.co.uk>
+Message-ID: <1359014873-29358-1-git-send-email-javier.martinez@collabora.co.uk>
+
+
+some users report to had a build error when NETFILTER config
+option is not set:
+
+net/bus/af_bus.c: In function 'bus_sendmsg':
+net/bus/af_bus.c:1511:7: warning: 'rcp_cnt' may be used uninitialized in
+this function
+  CC      net/bus/garbage.o
+  LD      net/bus/af-bus.o
+  CC      net/bus/nfdbus/nfdbus.o
+net/bus/nfdbus/nfdbus.c: In function 'nfdbus_init':
+net/bus/nfdbus/nfdbus.c:406:2: error: invalid use of undefined type
+'struct nf_hook_ops'
+net/bus/nfdbus/nfdbus.c:407:2: error: invalid use of undefined type
+'struct nf_hook_ops'
+net/bus/nfdbus/nfdbus.c:408:2: error: invalid use of undefined type
+'struct nf_hook_ops'
+net/bus/nfdbus/nfdbus.c:409:2: error: invalid use of undefined type
+'struct nf_hook_ops'
+net/bus/nfdbus/nfdbus.c:410:2: error: invalid use of undefined type
+'struct nf_hook_ops'
+net/bus/nfdbus/nfdbus.c:411:2: error: implicit declaration of function
+'nf_register_hook'
+net/bus/nfdbus/nfdbus.c:425:2: error: implicit declaration of function
+'nf_unregister_hook'
+make[3]: *** [net/bus/nfdbus/nfdbus.o] Error 1
+make[2]: *** [net/bus/nfdbus] Error 2
+make[1]: *** [net/bus] Error 2
+make: *** [net] Error 2
+
+this is because NETFILTER_DBUS uses symbols only defined when NETFITER=y
+
+Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
+---
+
+Hello Greg,
+
+I've seen that people send you incremental patches and you store them
+on "patches.fixes" directory. That's why I'm sending a delta patch.
+
+Please let me know if you prefer to have the original corresponding
+patch with this fix squashed.
+
+Thanks a lot.
+
+ net/bus/nfdbus/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/bus/nfdbus/Kconfig
++++ b/net/bus/nfdbus/Kconfig
+@@ -3,7 +3,7 @@
+ #
+ config NETFILTER_DBUS
+ 	tristate "Netfilter D-bus (EXPERIMENTAL)"
+-	depends on AF_BUS && CONNECTOR && EXPERIMENTAL
++	depends on AF_BUS && NETFILTER && CONNECTOR && EXPERIMENTAL
+ 	---help---
+ 	  If you say Y here, you will include support for a netfilter hook to
+ 	  parse D-Bus messages sent using the AF_BUS socket address family.
diff --git a/series b/series
index 7e17424e0caf55..c837f204e0195b 100644
--- a/series
+++ b/series
@@ -85,7 +85,7 @@ patches.af_bus/0012-netlink-connector-Add-idx-and-val-identifiers-for-ne.patch
 patches.af_bus/0013-netfilter-nfdbus-Add-D-bus-message-parsing.patch
 patches.af_bus/0014-netfilter-nfdbus-Add-D-bus-match-rule-implementation.patch
 patches.af_bus/0015-netfilter-add-netfilter-D-Bus-module.patch
-
+patches.af_bus/af_bus-make-netfilter_dbus-depend-on-netfilter.patch
 
 #############################################################################
 # pramfs