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

Commit c30ae138 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6

parents 78b85956 be21871f

drivers/bluetooth/ath3k.c

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ 
static struct usb_device_id ath3k_table[] = {

	/* Atheros AR3011 */

	{ USB_DEVICE(0x0CF3, 0x3000) },



	/* Atheros AR3011 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x3002) },



	{ }	/* Terminating entry */

};

drivers/bluetooth/btusb.c

+9 −3
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ static struct usb_device_id blacklist_table[] = { 
	/* Broadcom BCM2033 without firmware */

	{ USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE },



	/* Atheros 3011 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },



	/* Broadcom BCM2035 */

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
@@ -239,6 +242,7 @@ static void btusb_intr_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);
@@ -323,6 +327,7 @@ static void btusb_bulk_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);
@@ -412,6 +417,7 @@ static void btusb_isoc_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);

include/net/bluetooth/hci_core.h

+7 −7
Original line number Diff line number Diff line
@@ -215,8 +215,8 @@ extern rwlock_t hci_dev_list_lock; 
extern rwlock_t hci_cb_list_lock;



/* ----- Inquiry cache ----- */

#define INQUIRY_CACHE_AGE_MAX   (HZ*30)   // 30 seconds

#define INQUIRY_ENTRY_AGE_MAX   (HZ*60)   // 60 seconds

#define INQUIRY_CACHE_AGE_MAX   (HZ*30)   /* 30 seconds */

#define INQUIRY_ENTRY_AGE_MAX   (HZ*60)   /* 60 seconds */



#define inquiry_cache_lock(c)		spin_lock(&c->lock)

#define inquiry_cache_unlock(c)		spin_unlock(&c->lock)

include/net/bluetooth/l2cap.h

+11 −11
Original line number Diff line number Diff line
@@ -417,11 +417,11 @@ static inline int l2cap_tx_window_full(struct sock *sk) 
	return sub == pi->remote_tx_win;

}



#define __get_txseq(ctrl) ((ctrl) & L2CAP_CTRL_TXSEQ) >> 1

#define __get_reqseq(ctrl) ((ctrl) & L2CAP_CTRL_REQSEQ) >> 8

#define __is_iframe(ctrl) !((ctrl) & L2CAP_CTRL_FRAME_TYPE)

#define __is_sframe(ctrl) (ctrl) & L2CAP_CTRL_FRAME_TYPE

#define __is_sar_start(ctrl) ((ctrl) & L2CAP_CTRL_SAR) == L2CAP_SDU_START

#define __get_txseq(ctrl)	(((ctrl) & L2CAP_CTRL_TXSEQ) >> 1)

#define __get_reqseq(ctrl)	(((ctrl) & L2CAP_CTRL_REQSEQ) >> 8)

#define __is_iframe(ctrl)	(!((ctrl) & L2CAP_CTRL_FRAME_TYPE))

#define __is_sframe(ctrl)	((ctrl) & L2CAP_CTRL_FRAME_TYPE)

#define __is_sar_start(ctrl)	(((ctrl) & L2CAP_CTRL_SAR) == L2CAP_SDU_START)



void l2cap_load(void);

include/net/bluetooth/rfcomm.h

+9 −9
Original line number Diff line number Diff line 
/*

   RFCOMM implementation for Linux Bluetooth stack (BlueZ).

   RFCOMM implementation for Linux Bluetooth stack (BlueZ)

   Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>

   Copyright (C) 2002 Marcel Holtmann <marcel@holtmann.org>
@@ -105,7 +105,7 @@ 
struct rfcomm_hdr {

	u8 addr;

	u8 ctrl;

	u8 len;    // Actual size can be 2 bytes

	u8 len;    /* Actual size can be 2 bytes */

} __packed;



struct rfcomm_cmd {