Commit 8bfadc32 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 W. Linville says:

====================
Here is one last(?) big wireless bits pull request before the merge window...

Regarding the mac80211 bits, Johannes says:

"Here's another big pull request for the -next stream. This one has a ton
of driver updates, which hopefully addresses all drivers, but maybe you
have more new drivers than I have in my tree? Not entirely sure, let me
know if this is the case and then I can merge wireless-next.

I'm including a large number of small changes, see the shortlog. The two
bigger things are making VHT compatible with not using channel contexts
(from Karl) and the stop-while-suspended fixes I developed together with
Stanislaw."

...and...

"This time I have a relatively large number of fixes and small
improvements, the most important one being Bob's RCU fix. The two big
things are Felix's work on rate scaling tables (with a big thanks to
Karl too) and my own work on CSA handling to finally properly handle HT
(and some VHT.)"

As for the iwlwifi bits, Johannes says:

"The biggest work here is Bluetooth coexistence and power saving. Other
than that, I have a few small fixes that weren't really needed for 3.9
and a new PCI ID."

About the NFC bits, Samuel says:

"With this one we have:

- A major pn533 update. The pn533 framing support has been changed in order to
  easily support all pn533 derivatives. For example we now support the ACR122
  USB dongle.

- An NFC MEI physical layer code factorization through the mei_phy NFC API.
  Both the microread and the pn544 drivers now use it.

- LLCP aggregation support. This allows NFC p2p devices to send aggregated
  frames containing all sort of LLCP frames except SYMM and aggregation
  frames.

- More LLCP socket options for getting the remote device link parameters.

- Fixes for the LLCP socket option code added with the first pull request for
  3.10.

- Some support for LLCP corner cases like 0 length SDUs and general DISC
  (tagged with a 0,0 dsap ssap couple) handling.

- RFKILL support for NFC."

For the b43 bits, Rafał says:

"Let me remind the changes for b43:
> Changes include:
> 1) Minor improvements for HT-PHY code (BCM4331)
> 2) Code cleaning for HT-PHY and N-PHY"

Concerning the bluetooth bits, Gustavo says:

"A set of changes intended for 3.10. The biggest changes here are from David
Herrmann, he rewrote most of the HIDP layer making it more reliable. Marcel
added a driver setup stage for device that need special handling on their
early initialization. Other than that we have the usual clean ups, bugfixes
and small improvements."

Along with all that, there is the usual collection of random/various
updates to ath9k, mwifiex, brcmfmac, brcmsmac, rt2x00, and wil6210.

I also included a pull of the wireless tree to resolve a merge conflict.

Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1bf9310a 6ed0e321

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ static struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3393) },

	{ USB_DEVICE(0x0489, 0xe04e) },

	{ USB_DEVICE(0x0489, 0xe056) },

	{ USB_DEVICE(0x0489, 0xe04d) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -126,6 +127,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU22 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+25 −16
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
@@ -926,6 +927,22 @@ static void btusb_waker(struct work_struct *work) 
	usb_autopm_put_interface(data->intf);

}



static int btusb_setup_bcm92035(struct hci_dev *hdev)

{

	struct sk_buff *skb;

	u8 val = 0x00;



	BT_DBG("%s", hdev->name);



	skb = __hci_cmd_sync(hdev, 0xfc3b, 1, &val, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb))

		BT_ERR("BCM92035 command failed (%ld)", -PTR_ERR(skb));

	else

		kfree_skb(skb);



	return 0;

}



static int btusb_probe(struct usb_interface *intf,

				const struct usb_device_id *id)

{
@@ -1028,6 +1045,9 @@ static int btusb_probe(struct usb_interface *intf, 
	hdev->send   = btusb_send_frame;

	hdev->notify = btusb_notify;



	if (id->driver_info & BTUSB_BCM92035)

		hdev->setup = btusb_setup_bcm92035;



	/* Interface numbers are hardcoded in the specification */

	data->isoc = usb_ifnum_to_if(data->udev, 1);
@@ -1065,17 +1085,6 @@ static int btusb_probe(struct usb_interface *intf, 
		data->isoc = NULL;

	}



	if (id->driver_info & BTUSB_BCM92035) {

		unsigned char cmd[] = { 0x3b, 0xfc, 0x01, 0x00 };

		struct sk_buff *skb;



		skb = bt_skb_alloc(sizeof(cmd), GFP_KERNEL);

		if (skb) {

			memcpy(skb_put(skb, sizeof(cmd)), cmd, sizeof(cmd));

			skb_queue_tail(&hdev->driver_init, skb);

		}

	}



	if (data->isoc) {

		err = usb_driver_claim_interface(&btusb_driver,

							data->isoc, data);

drivers/bluetooth/hci_h4.c

+3 −0
Original line number Diff line number Diff line
@@ -153,6 +153,9 @@ static int h4_recv(struct hci_uart *hu, void *data, int count) 
{

	int ret;



	if (!test_bit(HCI_UART_REGISTERED, &hu->flags))

		return -EUNATCH;



	ret = hci_recv_stream_fragment(hu->hdev, data, count);

	if (ret < 0) {

		BT_ERR("Frame Reassembly Failed");

drivers/bluetooth/hci_ldisc.c

+9 −6
Original line number Diff line number Diff line
@@ -388,7 +388,10 @@ static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *f 


	spin_lock(&hu->rx_lock);

	hu->proto->recv(hu, (void *) data, count);



	if (hu->hdev)

		hu->hdev->stat.byte_rx += count;



	spin_unlock(&hu->rx_lock);



	tty_unthrottle(tty);

drivers/net/wireless/adm8211.c

+2 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,8 @@ static int adm8211_config(struct ieee80211_hw *dev, u32 changed) 
{

	struct adm8211_priv *priv = dev->priv;

	struct ieee80211_conf *conf = &dev->conf;

	int channel = ieee80211_frequency_to_channel(conf->channel->center_freq);

	int channel =

		ieee80211_frequency_to_channel(conf->chandef.chan->center_freq);



	if (channel != priv->channel) {

		priv->channel = channel;

CRA Git | Maintained and supported by SUSTech CRA and CCSE