* Pull request: bluetooth-next-2.6 2009-06-14
@ 2009-06-14 13:39 Marcel Holtmann
2009-06-14 13:39 ` [PATCH 1/2] Bluetooth: Fix Kconfig issue with RFKILL integration Marcel Holtmann
2009-06-15 8:54 ` Pull request: bluetooth-next-2.6 2009-06-14 David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Marcel Holtmann @ 2009-06-14 13:39 UTC (permalink / raw)
To: David Miller; +Cc: netdev
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] Bluetooth: Fix Kconfig issue with RFKILL integration
2009-06-14 13:39 Pull request: bluetooth-next-2.6 2009-06-14 Marcel Holtmann
@ 2009-06-14 13:39 ` Marcel Holtmann
2009-06-14 13:39 ` [PATCH 2/2] Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver Marcel Holtmann
2009-06-15 8:54 ` Pull request: bluetooth-next-2.6 2009-06-14 David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Marcel Holtmann @ 2009-06-14 13:39 UTC (permalink / raw)
To: David Miller; +Cc: netdev
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 <a.beregalov@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
net/bluetooth/Kconfig | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index 7725da9..59fdb1d 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver
2009-06-14 13:39 ` [PATCH 1/2] Bluetooth: Fix Kconfig issue with RFKILL integration Marcel Holtmann
@ 2009-06-14 13:39 ` Marcel Holtmann
0 siblings, 0 replies; 4+ messages in thread
From: Marcel Holtmann @ 2009-06-14 13:39 UTC (permalink / raw)
To: David Miller; +Cc: netdev
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.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
drivers/bluetooth/dtl1_cs.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 901bdd9..2cc7b32 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: Pull request: bluetooth-next-2.6 2009-06-14
2009-06-14 13:39 Pull request: bluetooth-next-2.6 2009-06-14 Marcel Holtmann
2009-06-14 13:39 ` [PATCH 1/2] Bluetooth: Fix Kconfig issue with RFKILL integration Marcel Holtmann
@ 2009-06-15 8:54 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2009-06-15 8:54 UTC (permalink / raw)
To: marcel; +Cc: netdev
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 14 Jun 2009 15:39:09 +0200
> 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.
Pulled, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-06-15 8:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-14 13:39 Pull request: bluetooth-next-2.6 2009-06-14 Marcel Holtmann
2009-06-14 13:39 ` [PATCH 1/2] Bluetooth: Fix Kconfig issue with RFKILL integration Marcel Holtmann
2009-06-14 13:39 ` [PATCH 2/2] Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver Marcel Holtmann
2009-06-15 8:54 ` Pull request: bluetooth-next-2.6 2009-06-14 David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.