Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f09cc910 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
  [IPSEC] IPV6: Fix to add tunnel mode SA correctly.
  [NET]: Cut off the queue_mapping field from sk_buff
  [NET]: Hide the queue_mapping field inside netif_subqueue_stopped
  [NET]: Make and use skb_get_queue_mapping
  [NET]: Use the skb_set_queue_mapping where appropriate
  [INET]: Use MODULE_ALIAS_NET_PF_PROTO_TYPE where possible.
  [INET]: Let inet_diag and friends autoload
  [NIU]: Cleanup PAGE_SIZE checks a bit
  [NET]: Fix SKB_WITH_OVERHEAD calculation
  [ATM]: Fix clip module reload crash.
  [TG3]: Update version to 3.85
  [TG3]: PCI command adjustment
  [TG3]: Add management FW version to ethtool report
  [TG3]: Add 5723 support
  [Bluetooth] Convert RFCOMM to use kthread API
  [Bluetooth] Add constant for Bluetooth socket options level
  [Bluetooth] Add support for handling simple eSCO links
  [Bluetooth] Add address and channel attribute to RFCOMM TTY device
  [Bluetooth] Fix wrong argument in debug code of HIDP
  [Bluetooth] Add generic driver for Bluetooth USB devices
  ...
parents 8b0eacca ea2c47b4

drivers/bluetooth/Kconfig

+35 −0
Original line number Diff line number Diff line
@@ -22,6 +22,30 @@ config BT_HCIUSB_SCO 


	  Say Y here to compile support for SCO over HCI USB.



config BT_HCIBTUSB

	tristate "HCI USB driver (alternate version)"

	depends on USB && EXPERIMENTAL && BT_HCIUSB=n

	help

	  Bluetooth HCI USB driver.

	  This driver is required if you want to use Bluetooth devices with

	  USB interface.



          This driver is still experimental and has no SCO support.



	  Say Y here to compile support for Bluetooth USB devices into the

	  kernel or say M to compile it as module (btusb).



config BT_HCIBTSDIO

	tristate "HCI SDIO driver"

	depends on MMC

	help

	  Bluetooth HCI SDIO driver.

	  This driver is required if you want to use Bluetooth device with

	  SDIO interface.



	  Say Y here to compile support for Bluetooth SDIO devices into the

	  kernel or say M to compile it as module (btsdio).



config BT_HCIUART

	tristate "HCI UART driver"

	help
@@ -55,6 +79,17 @@ config BT_HCIUART_BCSP 


	  Say Y here to compile support for HCI BCSP protocol.



config BT_HCIUART_LL

	bool "HCILL protocol support"

	depends on BT_HCIUART

	help

	  HCILL (HCI Low Level) is a serial protocol for communication

	  between Bluetooth device and host. This protocol is required for

	  serial Bluetooth devices that are based on Texas Instruments'

	  BRF chips.



	  Say Y here to compile support for HCILL protocol.



config BT_HCIBCM203X

	tristate "HCI BCM203x USB driver"

	depends on USB

drivers/bluetooth/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -13,7 +13,11 @@ obj-$(CONFIG_BT_HCIBT3C) += bt3c_cs.o 
obj-$(CONFIG_BT_HCIBLUECARD)	+= bluecard_cs.o

obj-$(CONFIG_BT_HCIBTUART)	+= btuart_cs.o



obj-$(CONFIG_BT_HCIBTUSB)	+= btusb.o

obj-$(CONFIG_BT_HCIBTSDIO)	+= btsdio.o



hci_uart-y				:= hci_ldisc.o

hci_uart-$(CONFIG_BT_HCIUART_H4)	+= hci_h4.o

hci_uart-$(CONFIG_BT_HCIUART_BCSP)	+= hci_bcsp.o

hci_uart-$(CONFIG_BT_HCIUART_LL)	+= hci_ll.o

hci_uart-objs				:= $(hci_uart-y)

drivers/bluetooth/bluecard_cs.c

+1 −4
Original line number Diff line number Diff line
@@ -503,10 +503,7 @@ static irqreturn_t bluecard_interrupt(int irq, void *dev_inst) 
	unsigned int iobase;

	unsigned char reg;



	if (!info || !info->hdev) {

		BT_ERR("Call of irq %d for unknown device", irq);

		return IRQ_NONE;

	}

	BUG_ON(!info->hdev);



	if (!test_bit(CARD_READY, &(info->hw_state)))

		return IRQ_HANDLED;

drivers/bluetooth/bpa10x.c

+262 −362

File changed.

Preview size limit exceeded, changes collapsed.

drivers/bluetooth/bt3c_cs.c

+1 −4
Original line number Diff line number Diff line
@@ -344,10 +344,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst) 
	unsigned int iobase;

	int iir;



	if (!info || !info->hdev) {

		BT_ERR("Call of irq %d for unknown device", irq);

		return IRQ_NONE;

	}

	BUG_ON(!info->hdev);



	iobase = info->p_dev->io.BasePort1;