Commit 1a6c1e5b 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:

====================
Please pull these updates for the 3.14 stream!

For the mac80211 bits, Johannes says:

"Felix adds some helper functions for P2P NoA software tracking, Joe
fixes alignment (but as this apparently never caused issues I didn't
send it to 3.13), Kyeyoon/Jouni add QoS-mapping support (a Hotspot 2.0
feature), Weilong fixed a bunch of checkpatch errors and I get to play
fire-fighter or so and clean up other people's locking issues. I also
added nl80211 vendor-specific events, as we'd discussed at the wireless
summit."

For the iwlwifi bits, Emmanuel says:

"I have here a rework of the interrupt handling to meet RT kernel
requirements - basically we don't take any lock in the primary interrupt
handler. This gave me a good reason to clean things up a bit on the way.
There is also a fix of the QoS mapping along with a few workarounds for
hardware / firmware issues that are hard to hit.
Three fixes suggested by static analyzers, and other various stuff.
Most importantly, I update the Copyright note to include the new year."

For the bluetooth bits, Gustavo says:

"More patches to 3.14. The bulk of changes here is the 6LoWPAN support for
Bluetooth LE Devices. The commits that touches net/ieee802154/ are already
acked by David Miller. Other than that we have some RFCOMM fixes and
improvements plus fixes and clean ups all over the tree."

Beyond that, ath9k, brcmfmac, mwifiex, and wil6210 get their usual
level of attention.  The wl1251 driver gets a number of updates,
and there are a handful of other bits here and there.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ef8570d8 235f9392

drivers/bcma/driver_chipcommon_sflash.c

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static const struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = { 
	{ "M25P32", 0x15, 0x10000, 64, },

	{ "M25P64", 0x16, 0x10000, 128, },

	{ "M25FL128", 0x17, 0x10000, 256, },

	{ 0 },

	{ NULL },

};



static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
@@ -56,7 +56,7 @@ static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = { 
	{ "SST25VF016", 0x41, 0x1000, 512, },

	{ "SST25VF032", 0x4a, 0x1000, 1024, },

	{ "SST25VF064", 0x4b, 0x1000, 2048, },

	{ 0 },

	{ NULL },

};



static const struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {
@@ -67,7 +67,7 @@ static const struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = { 
	{ "AT45DB161", 0x2c, 512, 4096, },

	{ "AT45DB321", 0x34, 512, 8192, },

	{ "AT45DB642", 0x3c, 1024, 8192, },

	{ 0 },

	{ NULL },

};



static void bcma_sflash_cmd(struct bcma_drv_cc *cc, u32 opcode)

drivers/bluetooth/btsdio.c

+5 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ struct btsdio_data { 
#define REG_CL_INTRD 0x13	/* Interrupt Clear */

#define REG_EN_INTRD 0x14	/* Interrupt Enable */

#define REG_MD_STAT  0x20	/* Bluetooth Mode Status */

#define REG_MD_SET   0x20	/* Bluetooth Mode Set */



static int btsdio_tx_packet(struct btsdio_data *data, struct sk_buff *skb)

{
@@ -212,7 +213,7 @@ static int btsdio_open(struct hci_dev *hdev) 
	}



	if (data->func->class == SDIO_CLASS_BT_B)

		sdio_writeb(data->func, 0x00, REG_MD_STAT, NULL);

		sdio_writeb(data->func, 0x00, REG_MD_SET, NULL);



	sdio_writeb(data->func, 0x01, REG_EN_INTRD, NULL);
@@ -333,6 +334,9 @@ static int btsdio_probe(struct sdio_func *func, 
	hdev->flush    = btsdio_flush;

	hdev->send     = btsdio_send_frame;



	if (func->vendor == 0x0104 && func->device == 0x00c5)

		set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);



	err = hci_register_dev(hdev);

	if (err < 0) {

		hci_free_dev(hdev);

drivers/bluetooth/btusb.c

+45 −1
Original line number Diff line number Diff line
@@ -965,6 +965,45 @@ static int btusb_setup_bcm92035(struct hci_dev *hdev) 
	return 0;

}



static int btusb_setup_csr(struct hci_dev *hdev)

{

	struct hci_rp_read_local_version *rp;

	struct sk_buff *skb;

	int ret;



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



	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL,

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		BT_ERR("Reading local version failed (%ld)", -PTR_ERR(skb));

		return -PTR_ERR(skb);

	}



	rp = (struct hci_rp_read_local_version *) skb->data;



	if (!rp->status) {

		if (le16_to_cpu(rp->manufacturer) != 10) {

			/* Clear the reset quirk since this is not an actual

			 * early Bluetooth 1.1 device from CSR.

			 */

			clear_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);



			/* These fake CSR controllers have all a broken

			 * stored link key handling and so just disable it.

			 */

			set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY,

				&hdev->quirks);

		}

	}



	ret = -bt_to_errno(rp->status);



	kfree_skb(skb);



	return ret;

}



struct intel_version {

	u8 status;

	u8 hw_platform;
@@ -1465,10 +1504,15 @@ static int btusb_probe(struct usb_interface *intf, 


	if (id->driver_info & BTUSB_CSR) {

		struct usb_device *udev = data->udev;

		u16 bcdDevice = le16_to_cpu(udev->descriptor.bcdDevice);



		/* Old firmware would otherwise execute USB reset */

		if (le16_to_cpu(udev->descriptor.bcdDevice) < 0x117)

		if (bcdDevice < 0x117)

			set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);



		/* Fake CSR devices with broken commands */

		if (bcdDevice <= 0x100)

			hdev->setup = btusb_setup_csr;

	}



	if (id->driver_info & BTUSB_SNIFFER) {

drivers/bluetooth/hci_vhci.c

+18 −11
Original line number Diff line number Diff line
@@ -141,23 +141,29 @@ static int vhci_create_device(struct vhci_data *data, __u8 dev_type) 
}



static inline ssize_t vhci_get_user(struct vhci_data *data,

				    const char __user *buf, size_t count)

				    const struct iovec *iov,

				    unsigned long count)

{

	size_t len = iov_length(iov, count);

	struct sk_buff *skb;

	__u8 pkt_type, dev_type;

	unsigned long i;

	int ret;



	if (count < 2 || count > HCI_MAX_FRAME_SIZE)

	if (len < 2 || len > HCI_MAX_FRAME_SIZE)

		return -EINVAL;



	skb = bt_skb_alloc(count, GFP_KERNEL);

	skb = bt_skb_alloc(len, GFP_KERNEL);

	if (!skb)

		return -ENOMEM;



	if (copy_from_user(skb_put(skb, count), buf, count)) {

	for (i = 0; i < count; i++) {

		if (copy_from_user(skb_put(skb, iov[i].iov_len),

				   iov[i].iov_base, iov[i].iov_len)) {

			kfree_skb(skb);

			return -EFAULT;

		}

	}



	pkt_type = *((__u8 *) skb->data);

	skb_pull(skb, 1);
@@ -205,7 +211,7 @@ static inline ssize_t vhci_get_user(struct vhci_data *data, 
		return -EINVAL;

	}



	return (ret < 0) ? ret : count;

	return (ret < 0) ? ret : len;

}



static inline ssize_t vhci_put_user(struct vhci_data *data,
@@ -272,12 +278,13 @@ static ssize_t vhci_read(struct file *file, 
	return ret;

}



static ssize_t vhci_write(struct file *file,

			  const char __user *buf, size_t count, loff_t *pos)

static ssize_t vhci_write(struct kiocb *iocb, const struct iovec *iov,

			  unsigned long count, loff_t pos)

{

	struct file *file = iocb->ki_filp;

	struct vhci_data *data = file->private_data;



	return vhci_get_user(data, buf, count);

	return vhci_get_user(data, iov, count);

}



static unsigned int vhci_poll(struct file *file, poll_table *wait)
@@ -342,7 +349,7 @@ static int vhci_release(struct inode *inode, struct file *file) 
static const struct file_operations vhci_fops = {

	.owner		= THIS_MODULE,

	.read		= vhci_read,

	.write		= vhci_write,

	.aio_write	= vhci_write,

	.poll		= vhci_poll,

	.open		= vhci_open,

	.release	= vhci_release,

drivers/net/wireless/adm8211.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 * more details.

 */



#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/if.h>

#include <linux/skbuff.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE