[PATCH] Bluetooth kbuild fix and config cleanup

This removes the obsolete O_TARGET and cleans up the Config.* and *.c
files to have a unique CONFIG_BLUEZ prefix.  Additional two missing help
entries are added.

diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index 09dd459be14efff8f9d3f8bd6c0d1db96265bdf9..15e76c032f2c9fbb961c0d9e026a39d09daad33a 100644 (file)
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for Bluetooth HCI device drivers.
+# Makefile for the Linux Bluetooth HCI device drivers.
 #
 
 obj-$(CONFIG_BLUEZ_HCIUSB)     += hci_usb.o

diff --git a/net/bluetooth/Config.help b/net/bluetooth/Config.help
index 9bb18e720a7a7151e36b3f1466905bc2bf4b850b..80b5d7a6ce657b63f8bddd821a33cedb4e58be37 100644 (file)
--- a/net/bluetooth/Config.help
+++ b/net/bluetooth/Config.help
@@ -10,8 +10,8 @@ CONFIG_BLUEZ
                BlueZ Core (HCI device and connection manager, scheduler)
                HCI Device drivers (interface to the hardware)
                L2CAP Module (L2CAP protocol)
-               RFCOMM Module (RFCOMM protocol)
                SCO Module (SCO links)
+               RFCOMM Module (RFCOMM protocol)  
                BNEP Module (BNEP protocol)
 
   Say Y here to enable Linux Bluetooth support and to build BlueZ Core
@@ -33,19 +33,6 @@ CONFIG_BLUEZ_L2CAP
   Say Y here to compile L2CAP support into the kernel or say M to
   compile it as module (l2cap.o).
 
-RFCOMM protocol support
-CONFIG_BLUEZ_RFCOMM
-  RFCOMM provides connection oriented stream transport. RFCOMM
-  support is required for Dialup Networking, OBEX and other Bluetooth
-  applications.
-
-  Say Y here to compile RFCOMM support into the kernel or say M to
-  compile it as module (rfcomm.o).
-
-RFCOMM TTY emulation support
-CONFIG_RFCOMM_TTY
-  This options enables TTY emulation support for RFCOMM channels.
-
 SCO links support
 CONFIG_BLUEZ_SCO
   SCO link provides voice transport over Bluetooth. SCO support is
@@ -54,16 +41,3 @@ CONFIG_BLUEZ_SCO
   Say Y here to compile SCO support into the kernel or say M to
   compile it as module (sco.o).
 
-BNEP protocol support
-CONFIG_BLUEZ_BNEP
-  BNEP (Bluetooth Network Encapsulation Protocol) is Ethernet
-  emulation layer on top of Bluetooth. BNEP is required for Bluetooth
-  PAN (Personal Area Network).
-
-  To use BNEP, you will need user-space utilities provided in the 
-  BlueZ-PAN package.
-  For more information, see <http://bluez.sourceforge.net>.
-
-  Say Y here to compile BNEP support into the kernel or say M to
-  compile it as module (bnep.o).
-

diff --git a/net/bluetooth/Config.in b/net/bluetooth/Config.in
index ddf740202ca070219c323fab8ec6a526b5915f7c..b9703040507a3afe337a493e0d81c3afc5692e7b 100644 (file)
--- a/net/bluetooth/Config.in
+++ b/net/bluetooth/Config.in
@@ -1,8 +1,9 @@
 #
-# Bluetooth configuration
+# Bluetooth subsystem configuration
 #
 
 if [ "$CONFIG_NET" != "n" ]; then
+
    mainmenu_option next_comment
    comment 'Bluetooth support'
    dep_tristate 'Bluetooth subsystem support' CONFIG_BLUEZ $CONFIG_NET
@@ -14,6 +15,7 @@ if [ "$CONFIG_NET" != "n" ]; then
       source net/bluetooth/bnep/Config.in
       source drivers/bluetooth/Config.in
    fi
+
    endmenu
 fi
 

diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
index f769086251caeca636870e4ad6dc81902dcdefb7..3ca0d58c859a9f4499cf8c3dc03f5650cb084a7a 100644 (file)
--- a/net/bluetooth/Makefile
+++ b/net/bluetooth/Makefile
@@ -1,25 +1,15 @@
 #
-# Makefile for the Bluetooth subsystem
+# Makefile for the Linux Bluetooth subsystem.
 #
 
-export-objs    := syms.o
+export-objs := syms.o
 
-obj-$(CONFIG_BLUEZ) += bluez.o
-obj-$(CONFIG_BLUEZ_L2CAP) += l2cap.o
-obj-$(CONFIG_BLUEZ_SCO) += sco.o
+obj-$(CONFIG_BLUEZ)            += bluez.o
+obj-$(CONFIG_BLUEZ_L2CAP)      += l2cap.o
+obj-$(CONFIG_BLUEZ_SCO)                += sco.o
+obj-$(CONFIG_BLUEZ_RFCOMM)     += rfcomm/
+obj-$(CONFIG_BLUEZ_BNEP)       += bnep/
 
-subdir-$(CONFIG_BLUEZ_BNEP) += bnep
-
-ifeq ($(CONFIG_BLUEZ_BNEP),y)
-obj-y += bnep/bnep.o
-endif
-
-subdir-$(CONFIG_BLUEZ_RFCOMM) += rfcomm
-
-ifeq ($(CONFIG_BLUEZ_RFCOMM),y)
-obj-y += rfcomm/rfcomm.o
-endif
-
-bluez-objs     := af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o lib.o syms.o
+bluez-objs := af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o lib.o syms.o
 
 include $(TOPDIR)/Rules.make

diff --git a/net/bluetooth/bnep/Config.help b/net/bluetooth/bnep/Config.help
new file mode 100644 (file)
index 0000000..64bafc9
--- /dev/null
+++ b/net/bluetooth/bnep/Config.help
@@ -0,0 +1,21 @@
+BNEP protocol support
+CONFIG_BLUEZ_BNEP
+  BNEP (Bluetooth Network Encapsulation Protocol) is Ethernet
+  emulation layer on top of Bluetooth. BNEP is required for Bluetooth
+  PAN (Personal Area Network).
+
+  To use BNEP, you will need user-space utilities provided in the 
+  BlueZ-PAN package.
+  For more information, see <http://bluez.sourceforge.net>.
+
+  Say Y here to compile BNEP support into the kernel or say M to
+  compile it as module (bnep.o).
+
+BNEP multicast filter support
+CONFIG_BLUEZ_BNEP_MC_FILTER
+  This option enables the multicast filter support for BNEP.
+
+BNEP protocol filter support
+CONFIG_BLUEZ_BNEP_PROTO_FILTER
+  This option enables the protocol filter support for BNEP.
+

diff --git a/net/bluetooth/bnep/Config.in b/net/bluetooth/bnep/Config.in
index 9494ca9c32b972c2179c1305155a0ef6e099d8ab..8de2ad3c951de72cfd1d6f1cef48c166c6686ba1 100644 (file)
--- a/net/bluetooth/bnep/Config.in
+++ b/net/bluetooth/bnep/Config.in
@@ -1,6 +1,8 @@
 
 dep_tristate 'BNEP protocol support' CONFIG_BLUEZ_BNEP $CONFIG_BLUEZ_L2CAP
+
 if [ "$CONFIG_BLUEZ_BNEP" != "n" ]; then
-   bool '  Multicast filter support' CONFIG_BNEP_MC_FILTER
-   bool '  Protocol filter support'  CONFIG_BNEP_PROTO_FILTER
+   bool '  Multicast filter support' CONFIG_BLUEZ_BNEP_MC_FILTER
+   bool '  Protocol filter support'  CONFIG_BLUEZ_BNEP_PROTO_FILTER
 fi
+

diff --git a/net/bluetooth/bnep/Makefile b/net/bluetooth/bnep/Makefile
index 1be31d86ed525bf2f597a13fa367c962f5fe0ce6..7baf319e271e92f2b83b0036d13abffbd551f38c 100644 (file)
--- a/net/bluetooth/bnep/Makefile
+++ b/net/bluetooth/bnep/Makefile
@@ -1,10 +1,9 @@
 #
-# Makefile for BNEP protocol
+# Makefile for the Linux Bluetooth BNEP layer.
 #
 
-O_TARGET := bnep.o
+obj-$(CONFIG_BLUEZ_BNEP) += bnep.o
 
-obj-y   := core.o sock.o netdev.o crc32.o
-obj-m    += $(O_TARGET)
+bnep-objs := core.o sock.o netdev.o crc32.o
 
 include $(TOPDIR)/Rules.make

diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index f210d97e463f5d7dacda2949eeb53a34795de653..a3ec54e8e226d1d906c3aca2c454a997d4544be5 100644 (file)
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -58,7 +58,7 @@
 
 #include "bnep.h"
 
-#ifndef CONFIG_BNEP_DEBUG
+#ifndef CONFIG_BLUEZ_BNEP_DEBUG
 #undef  BT_DBG
 #define BT_DBG(D...)
 #endif
@@ -129,7 +129,7 @@ static int bnep_ctrl_set_netfilter(struct bnep_session *s, struct sk_buff *skb)
 
        BT_DBG("filter len %d", n);
 
-#ifdef CONFIG_BNEP_PROTO_FILTER
+#ifdef CONFIG_BLUEZ_BNEP_PROTO_FILTER
        n /= 4;
        if (n <= BNEP_MAX_PROTO_FILTERS) {
                struct bnep_proto_filter *f = s->proto_filter;
@@ -171,7 +171,7 @@ static int bnep_ctrl_set_mcfilter(struct bnep_session *s, struct sk_buff *skb)
 
        BT_DBG("filter len %d", n);
 
-#ifdef CONFIG_BNEP_MC_FILTER
+#ifdef CONFIG_BLUEZ_BNEP_MC_FILTER
        n /= (ETH_ALEN * 2);
 
        if (n > 0) {
@@ -545,12 +545,12 @@ int bnep_add_connection(struct bnep_conadd_req *req, struct socket *sock)
        
        s->msg.msg_flags = MSG_NOSIGNAL;
 
-#ifdef CONFIG_BNEP_MC_FILTER
+#ifdef CONFIG_BLUEZ_BNEP_MC_FILTER
        /* Set default mc filter */
        set_bit(bnep_mc_hash(dev->broadcast), (ulong *) &s->mc_filter);
 #endif
        
-#ifdef CONFIG_BNEP_PROTO_FILTER
+#ifdef CONFIG_BLUEZ_BNEP_PROTO_FILTER
        /* Set default protocol filter */
 
        /* (IPv4, ARP)  */

diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index df3e8323b4e6439284ba2440863aa9b8b8d75902..bc17e026aefac3786907cb1c266fd5281f25ca3e 100644 (file)
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -46,7 +46,7 @@
 
 #include "bnep.h"
 
-#ifndef CONFIG_BNEP_DEBUG
+#ifndef CONFIG_BLUEZ_BNEP_DEBUG
 #undef  BT_DBG
 #define BT_DBG( A... )
 #endif
@@ -73,7 +73,7 @@ static struct net_device_stats *bnep_net_get_stats(struct net_device *dev)
 
 static void bnep_net_set_mc_list(struct net_device *dev)
 {
-#ifdef CONFIG_BNEP_MC_FILTER
+#ifdef CONFIG_BLUEZ_BNEP_MC_FILTER
        struct bnep_session *s = dev->priv;
        struct sock *sk = s->sock->sk;
        struct bnep_set_filter_req *r;
@@ -143,7 +143,7 @@ static int bnep_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        return -EINVAL;
 }
 
-#ifdef CONFIG_BNEP_MC_FILTER
+#ifdef CONFIG_BLUEZ_BNEP_MC_FILTER
 static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s)
 {
        struct ethhdr *eh = (void *) skb->data;
@@ -154,7 +154,7 @@ static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s
 }
 #endif
 
-#ifdef CONFIG_BNEP_PROTO_FILTER
+#ifdef CONFIG_BLUEZ_BNEP_PROTO_FILTER
 /* Determine ether protocol. Based on eth_type_trans. */
 static inline u16 bnep_net_eth_proto(struct sk_buff *skb)
 {
@@ -192,14 +192,14 @@ static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev)
 
        BT_DBG("skb %p, dev %p", skb, dev);
 
-#ifdef CONFIG_BNEP_MC_FILTER
+#ifdef CONFIG_BLUEZ_BNEP_MC_FILTER
        if (bnep_net_mc_filter(skb, s)) {
                kfree_skb(skb);
                return 0;
        }
 #endif
        
-#ifdef CONFIG_BNEP_PROTO_FILTER
+#ifdef CONFIG_BLUEZ_BNEP_PROTO_FILTER
        if (bnep_net_proto_filter(skb, s)) {
                kfree_skb(skb);
                return 0;

diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index 7271e2625c841e21b19fa665a86e56cc6fe1937e..c737acbea6aa96a31c8468fee5598ce69c4468a8 100644 (file)
--- a/net/bluetooth/bnep/sock.c
+++ b/net/bluetooth/bnep/sock.c
@@ -50,7 +50,7 @@
 
 #include "bnep.h"
 
-#ifndef CONFIG_BNEP_DEBUG
+#ifndef CONFIG_BLUEZ_BNEP_DEBUG
 #undef  BT_DBG
 #define BT_DBG( A... )
 #endif

diff --git a/net/bluetooth/rfcomm/Config.help b/net/bluetooth/rfcomm/Config.help
new file mode 100644 (file)
index 0000000..6d5ee6a
--- /dev/null
+++ b/net/bluetooth/rfcomm/Config.help
@@ -0,0 +1,12 @@
+RFCOMM protocol support
+CONFIG_BLUEZ_RFCOMM
+  RFCOMM provides connection oriented stream transport. RFCOMM
+  support is required for Dialup Networking, OBEX and other Bluetooth
+  applications.
+
+  Say Y here to compile RFCOMM support into the kernel or say M to
+  compile it as module (rfcomm.o).
+
+RFCOMM TTY emulation support
+CONFIG_BLUEZ_RFCOMM_TTY
+  This option enables TTY emulation support for RFCOMM channels.

diff --git a/net/bluetooth/rfcomm/Config.in b/net/bluetooth/rfcomm/Config.in
index 680f9693d33f620221fa13cef1f9591e7883141f..e3ad1358f873e903cfa3cd7a07ba228a84dbc37b 100644 (file)
--- a/net/bluetooth/rfcomm/Config.in
+++ b/net/bluetooth/rfcomm/Config.in
@@ -1,5 +1,7 @@
 
 dep_tristate 'RFCOMM protocol support' CONFIG_BLUEZ_RFCOMM $CONFIG_BLUEZ_L2CAP
+
 if [ "$CONFIG_BLUEZ_RFCOMM" != "n" ]; then
-   bool '  RFCOMM TTY support' CONFIG_RFCOMM_TTY
+   bool '  RFCOMM TTY support' CONFIG_BLUEZ_RFCOMM_TTY
 fi
+

diff --git a/net/bluetooth/rfcomm/Makefile b/net/bluetooth/rfcomm/Makefile
index b0e245508970a6612921f7d548da403c212c91cd..94fa0f6e1bba6aefb6088dc7dfe70dd1f7204cf6 100644 (file)
--- a/net/bluetooth/rfcomm/Makefile
+++ b/net/bluetooth/rfcomm/Makefile
@@ -1,11 +1,11 @@
 #
-# Makefile for BNEP protocol
+# Makefile for the Linux Bluetooth RFCOMM layer.
 #
 
-O_TARGET := rfcomm.o
+obj-$(CONFIG_BLUEZ_RFCOMM) += rfcomm.o
 
-obj-y   := core.o sock.o crc.o
-obj-$(CONFIG_RFCOMM_TTY) += tty.o
-obj-m    += $(O_TARGET)
+rfcomm-y                               := core.o sock.o crc.o
+rfcomm-$(CONFIG_BLUEZ_RFCOMM_TTY)      += tty.o
+rfcomm-objs                            := $(rfcomm-y)
 
 include $(TOPDIR)/Rules.make

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index de3dccc504c85e6b75a5af2959c4546dcc8c2de8..b392790a65040ae87f10e40dfd05f4b5a311538f 100644 (file)
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -52,7 +52,7 @@
 
 #define VERSION "0.3"
 
-#ifndef CONFIG_RFCOMM_DEBUG
+#ifndef CONFIG_BLUEZ_RFCOMM_DEBUG
 #undef  BT_DBG
 #define BT_DBG(D...)
 #endif
@@ -1679,7 +1679,10 @@ int __init rfcomm_init(void)
        kernel_thread(rfcomm_run, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
 
        rfcomm_init_sockets();
+
+#ifdef CONFIG_BLUEZ_RFCOMM_TTY
        rfcomm_init_ttys();
+#endif
 
        BT_INFO("BlueZ RFCOMM ver %s", VERSION);
        BT_INFO("Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>");
@@ -1698,7 +1701,10 @@ void rfcomm_cleanup(void)
        while (atomic_read(&running))
                schedule();
 
+#ifdef CONFIG_BLUEZ_RFCOMM_TTY
        rfcomm_cleanup_ttys();
+#endif
+
        rfcomm_cleanup_sockets();
        return;
 }

diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index a7cbb0ae0d01f88a7fc88992f1322fcd44cb9540..4c739e67f69f6b3cc550102138d318ff1a430aa7 100644 (file)
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -53,7 +53,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/rfcomm.h>
 
-#ifndef CONFIG_RFCOMM_DEBUG
+#ifndef CONFIG_BLUEZ_RFCOMM_DEBUG
 #undef  BT_DBG
 #define BT_DBG(D...)
 #endif
@@ -704,7 +704,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lon
 
        lock_sock(sk);
 
-#ifdef CONFIG_RFCOMM_TTY
+#ifdef CONFIG_BLUEZ_RFCOMM_TTY
        err = rfcomm_dev_ioctl(sk, cmd, arg);
 #else
        err = -EOPNOTSUPP;

diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 69347de88b0c25ba0bfca8a44948bd661141a195..78ed9b45ebfb310245f17d173c80c646c2847c10 100644 (file)
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -40,7 +40,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/rfcomm.h>
 
-#ifndef CONFIG_RFCOMM_DEBUG
+#ifndef CONFIG_BLUEZ_RFCOMM_DEBUG
 #undef  BT_DBG
 #define BT_DBG(D...)
 #endif