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

Commit f730cc9f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Johan Hedberg says:

====================
pull request: bluetooth-next 2017-10-19

Here's the first bluetooth-next pull request targeting the 4.15 kernel
release.

 - Multiple fixes & improvements to the hci_bcm driver
 - DT improvements, e.g. new local-bd-address property
 - Fixes & improvements to ECDH usage. Private key is now generated by
   the crypto subsystem.
 - gcc-4.9 warning fixes

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 164a5e7a fac72b24

Documentation/devicetree/bindings/net/bluetooth.txt

0 → 100644
+5 −0
Original line number Diff line number Diff line 
The following properties are common to the Bluetooth controllers:



- local-bd-address: array of 6 bytes, specifies the BD address that was

  uniquely assigned to the Bluetooth device, formatted with least significant

  byte first (little-endian).

Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt

+8 −0
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ The following properties are defined to the bluetooth node: 
	Definition: must be:

		    "qcom,wcnss-bt"



- local-bd-address:

	Usage: optional

	Value type: <u8 array>

	Definition: see Documentation/devicetree/bindings/net/bluetooth.txt



== WiFi

The following properties are defined to the WiFi node:
@@ -91,6 +96,9 @@ smd { 


			bt {

				compatible = "qcom,wcnss-bt";



				/* BD address 00:11:22:33:44:55 */

				local-bd-address = [ 55 44 33 22 11 00 ];

			};



			wlan {

drivers/bluetooth/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ config BT_HCIBTSDIO 


config BT_HCIUART

	tristate "HCI UART driver"

	depends on SERIAL_DEV_BUS || !SERIAL_DEV_BUS

	depends on TTY

	help

	  Bluetooth HCI UART driver.
@@ -79,7 +80,6 @@ config BT_HCIUART 
config BT_HCIUART_SERDEV

	bool

	depends on SERIAL_DEV_BUS && BT_HCIUART

	depends on SERIAL_DEV_BUS=y || SERIAL_DEV_BUS=BT_HCIUART

	default y



config BT_HCIUART_H4
@@ -169,6 +169,7 @@ config BT_HCIUART_BCM 
	bool "Broadcom protocol support"

	depends on BT_HCIUART

	depends on BT_HCIUART_SERDEV

	depends on (!ACPI || SERIAL_DEV_CTRL_TTYPORT)

	select BT_HCIUART_H4

	select BT_BCM

	help

drivers/bluetooth/bcm203x.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void bcm203x_complete(struct urb *urb) 
		}



		data->state = BCM203X_LOAD_FIRMWARE;



		/* fall through */

	case BCM203X_LOAD_FIRMWARE:

		if (data->fw_sent == data->fw_size) {

			usb_fill_int_urb(urb, udev, usb_rcvintpipe(udev, BCM203X_IN_EP),

drivers/bluetooth/bluecard_cs.c

+3 −4
Original line number Diff line number Diff line
@@ -156,9 +156,9 @@ static void bluecard_detach(struct pcmcia_device *p_dev); 
/* ======================== LED handling routines ======================== */





static void bluecard_activity_led_timeout(u_long arg)

static void bluecard_activity_led_timeout(struct timer_list *t)

{

	struct bluecard_info *info = (struct bluecard_info *)arg;

	struct bluecard_info *info = from_timer(info, t, timer);

	unsigned int iobase = info->p_dev->resource[0]->start;



	if (test_bit(CARD_ACTIVITY, &(info->hw_state))) {
@@ -691,8 +691,7 @@ static int bluecard_open(struct bluecard_info *info) 


	spin_lock_init(&(info->lock));



	setup_timer(&(info->timer), &bluecard_activity_led_timeout,

		    (u_long)info);

	timer_setup(&info->timer, bluecard_activity_led_timeout, 0);



	skb_queue_head_init(&(info->txq));