Pull request: bluetooth-next-2.6 2009-06-14

Hi Dave,

I have two more patches that should go into your networking merge. The first is fixing a build fallout from missing dependencies on the RFKILL subsystem. The second is fixing a build warning that is potentially dangerous with DTL-1 hardware when using unknown packet types.

Regards

Marcel

Please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git master

This will update the following files:

 drivers/bluetooth/dtl1_cs.c |    2 ++
 net/bluetooth/Kconfig       |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

through these ChangeSets:

Marcel Holtmann (2):
Bluetooth: Fix Kconfig issue with RFKILL integration
Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver

Since the re-write of the RFKILL subsystem it is no longer good to just select RFKILL, but it is important to add a proper depends on rule.

Based on a report by Alexander Beregalov <[email protected]>

---
 net/bluetooth/Kconfig |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

index 7725da9..59fdb1d 100644
@@ -3,8 +3,9 @@
 #
 
 menuconfig BT
-	depends on NET && !S390
 	tristate "Bluetooth subsystem support"
+	depends on NET && !S390
+	depends on RFKILL || !RFKILL
 	help
 	  Bluetooth is low-cost, low-power, short-range wireless technology.
 	  It was designed as a replacement for cables and other short-range

1.6.2.2

The current build shows a warning with the DTL-1 driver:

CC [M] drivers/bluetooth/dtl1_cs.o
drivers/bluetooth/dtl1_cs.c: In function ‘dtl1_hci_send_frame’:
drivers/bluetooth/dtl1_cs.c:396: warning: ‘nsh.type’ may be used uninitialized i n this function

Fix this by adding a proper error for unknown packet types.

---
 drivers/bluetooth/dtl1_cs.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

index 901bdd9..2cc7b32 100644
@@ -415,6 +415,8 @@ static int dtl1_hci_send_frame(struct sk_buff *skb)
 		hdev->stat.sco_tx++;
 		nsh.type = 0x83;
 		break;
+	default:
+		return -EILSEQ;
 	};
 
 	nsh.zero = 0;

1.6.2.2

From: Marcel Holtmann <[email protected]>
Date: Sun, 14 Jun 2009 15:39:09 +0200

Pulled, thanks.