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

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

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next 



John Linville says:

====================
This is a sizeable batch of updates intended for 3.6...

The bulk of the changes here are Bluetooth.  Gustavo says:

	Here goes the first Bluetooth pull request for 3.6, we have
	queued quite a lot of work. Andrei Emeltchenko added the AMP
	Manager code, a lot of work is needed, but the first bit are
	already there. This code is disabled by default.  Mat Martineau
	changed the whole L2CAP ERTM state machine code, replacing
	the old one with a new implementation. Besides that we had
	lot of coding style fixes (to follow net rules), more l2cap
	core separation from socket and many clean ups and fixed all
	over the tree.

Along with the above, there is a healthy dose of ath9k, iwlwifi,
and other driver updates.  There is also another pull from the
wireless tree to resolve some merge issues.  I also fixed-up some
merge discrepencies between net-next and wireless-next.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 364f5b3a b3c911ee

drivers/bluetooth/bluecard_cs.c

+5 −5
Original line number Diff line number Diff line
@@ -231,12 +231,12 @@ static void bluecard_write_wakeup(bluecard_info_t *info) 
	}



	do {

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

		register unsigned int offset;

		register unsigned char command;

		register unsigned long ready_bit;

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

		unsigned int offset;

		unsigned char command;

		unsigned long ready_bit;

		register struct sk_buff *skb;

		register int len;

		int len;



		clear_bit(XMIT_WAKEUP, &(info->tx_state));

drivers/bluetooth/bpa10x.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id * 
	hdev->flush    = bpa10x_flush;

	hdev->send     = bpa10x_send_frame;



	set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);

	set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);



	err = hci_register_dev(hdev);

	if (err < 0) {

drivers/bluetooth/bt3c_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -186,9 +186,9 @@ static void bt3c_write_wakeup(bt3c_info_t *info) 
		return;



	do {

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

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

		register struct sk_buff *skb;

		register int len;

		int len;



		if (!pcmcia_dev_present(info->p_dev))

			break;

drivers/bluetooth/btmrvl_sdio.c

+3 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ static const struct sdio_device_id btmrvl_sdio_ids[] = { 
	/* Marvell SD8787 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911A),

			.driver_data = (unsigned long) &btmrvl_sdio_sd8787 },

	/* Marvell SD8787 Bluetooth AMP device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911B),

			.driver_data = (unsigned long) &btmrvl_sdio_sd8787 },

	/* Marvell SD8797 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),

			.driver_data = (unsigned long) &btmrvl_sdio_sd8797 },

drivers/bluetooth/btuart_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -140,9 +140,9 @@ static void btuart_write_wakeup(btuart_info_t *info) 
	}



	do {

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

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

		register struct sk_buff *skb;

		register int len;

		int len;



		clear_bit(XMIT_WAKEUP, &(info->tx_state));