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

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

Merge branch 'master' of... 

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

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
parents f421436a 01925efd

drivers/bluetooth/ath3k.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct ath3k_version { 
	unsigned char	reserved[0x07];

};



static struct usb_device_id ath3k_table[] = {

static const struct usb_device_id ath3k_table[] = {

	/* Atheros AR3011 */

	{ USB_DEVICE(0x0CF3, 0x3000) },
@@ -112,7 +112,7 @@ MODULE_DEVICE_TABLE(usb, ath3k_table); 
#define BTUSB_ATH3012		0x80

/* This table is to load patch and sysconfig files

 * for AR3012 */

static struct usb_device_id ath3k_blist_tbl[] = {

static const struct usb_device_id ath3k_blist_tbl[] = {



	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/bfusb.c

+8 −23
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


static struct usb_driver bfusb_driver;



static struct usb_device_id bfusb_table[] = {

static const struct usb_device_id bfusb_table[] = {

	/* AVM BlueFRITZ! USB */

	{ USB_DEVICE(0x057c, 0x2200) },
@@ -318,7 +318,6 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch 
			return -ENOMEM;

		}



		skb->dev = (void *) data->hdev;

		bt_cb(skb)->pkt_type = pkt_type;



		data->reassembly = skb;
@@ -333,7 +332,7 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch 
		memcpy(skb_put(data->reassembly, len), buf, len);



	if (hdr & 0x08) {

		hci_recv_frame(data->reassembly);

		hci_recv_frame(data->hdev, data->reassembly);

		data->reassembly = NULL;

	}
@@ -465,26 +464,18 @@ static int bfusb_close(struct hci_dev *hdev) 
	return 0;

}



static int bfusb_send_frame(struct sk_buff *skb)

static int bfusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct hci_dev *hdev = (struct hci_dev *) skb->dev;

	struct bfusb_data *data;

	struct bfusb_data *data = hci_get_drvdata(hdev);

	struct sk_buff *nskb;

	unsigned char buf[3];

	int sent = 0, size, count;



	BT_DBG("hdev %p skb %p type %d len %d", hdev, skb, bt_cb(skb)->pkt_type, skb->len);



	if (!hdev) {

		BT_ERR("Frame for unknown HCI device (hdev=NULL)");

		return -ENODEV;

	}



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return -EBUSY;



	data = hci_get_drvdata(hdev);



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		hdev->stat.cmd_tx++;
@@ -544,11 +535,6 @@ static int bfusb_send_frame(struct sk_buff *skb) 
	return 0;

}



static int bfusb_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned long arg)

{

	return -ENOIOCTLCMD;

}



static int bfusb_load_firmware(struct bfusb_data *data,

			       const unsigned char *firmware, int count)

{
@@ -703,7 +689,6 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
	hdev->close = bfusb_close;

	hdev->flush = bfusb_flush;

	hdev->send  = bfusb_send_frame;

	hdev->ioctl    = bfusb_ioctl;



	if (hci_register_dev(hdev) < 0) {

		BT_ERR("Can't register HCI device");

drivers/bluetooth/bluecard_cs.c

+7 −23
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset) 


		if (info->rx_state == RECV_WAIT_PACKET_TYPE) {



			info->rx_skb->dev = (void *) info->hdev;

			bt_cb(info->rx_skb)->pkt_type = buf[i];



			switch (bt_cb(info->rx_skb)->pkt_type) {
@@ -477,7 +476,7 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset) 
					break;



				case RECV_WAIT_DATA:

					hci_recv_frame(info->rx_skb);

					hci_recv_frame(info->hdev, info->rx_skb);

					info->rx_skb = NULL;

					break;
@@ -659,17 +658,9 @@ static int bluecard_hci_close(struct hci_dev *hdev) 
}





static int bluecard_hci_send_frame(struct sk_buff *skb)

static int bluecard_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)

{

	bluecard_info_t *info;

	struct hci_dev *hdev = (struct hci_dev *)(skb->dev);



	if (!hdev) {

		BT_ERR("Frame for unknown HCI device (hdev=NULL)");

		return -ENODEV;

	}



	info = hci_get_drvdata(hdev);

	bluecard_info_t *info = hci_get_drvdata(hdev);



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:
@@ -693,12 +684,6 @@ static int bluecard_hci_send_frame(struct sk_buff *skb) 
}





static int bluecard_hci_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned long arg)

{

	return -ENOIOCTLCMD;

}







/* ======================== Card services HCI interaction ======================== */
@@ -738,7 +723,6 @@ static int bluecard_open(bluecard_info_t *info) 
	hdev->close = bluecard_hci_close;

	hdev->flush = bluecard_hci_flush;

	hdev->send  = bluecard_hci_send_frame;

	hdev->ioctl    = bluecard_hci_ioctl;



	id = inb(iobase + 0x30);

drivers/bluetooth/bpa10x.c

+5 −6
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


#define VERSION "0.10"



static struct usb_device_id bpa10x_table[] = {

static const struct usb_device_id bpa10x_table[] = {

	/* Tektronix BPA 100/105 (Digianswer) */

	{ USB_DEVICE(0x08fd, 0x0002) },
@@ -129,8 +129,6 @@ static int bpa10x_recv(struct hci_dev *hdev, int queue, void *buf, int count) 
				return -ENOMEM;

			}



			skb->dev = (void *) hdev;



			data->rx_skb[queue] = skb;



			scb = (void *) skb->cb;
@@ -155,7 +153,7 @@ static int bpa10x_recv(struct hci_dev *hdev, int queue, void *buf, int count) 
			data->rx_skb[queue] = NULL;



			bt_cb(skb)->pkt_type = scb->type;

			hci_recv_frame(skb);

			hci_recv_frame(hdev, skb);

		}



		count -= len; buf += len;
@@ -352,9 +350,8 @@ static int bpa10x_flush(struct hci_dev *hdev) 
	return 0;

}



static int bpa10x_send_frame(struct sk_buff *skb)

static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct hci_dev *hdev = (struct hci_dev *) skb->dev;

	struct bpa10x_data *data = hci_get_drvdata(hdev);

	struct usb_ctrlrequest *dr;

	struct urb *urb;
@@ -366,6 +363,8 @@ static int bpa10x_send_frame(struct sk_buff *skb) 
	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return -EBUSY;



	skb->dev = (void *) hdev;



	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!urb)

		return -ENOMEM;

drivers/bluetooth/bt3c_cs.c

+7 −23
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ static void bt3c_receive(bt3c_info_t *info) 


		if (info->rx_state == RECV_WAIT_PACKET_TYPE) {



			info->rx_skb->dev = (void *) info->hdev;

			bt_cb(info->rx_skb)->pkt_type = inb(iobase + DATA_L);

			inb(iobase + DATA_H);

			//printk("bt3c: PACKET_TYPE=%02x\n", bt_cb(info->rx_skb)->pkt_type);
@@ -318,7 +317,7 @@ static void bt3c_receive(bt3c_info_t *info) 
					break;



				case RECV_WAIT_DATA:

					hci_recv_frame(info->rx_skb);

					hci_recv_frame(info->hdev, info->rx_skb);

					info->rx_skb = NULL;

					break;
@@ -416,19 +415,11 @@ static int bt3c_hci_close(struct hci_dev *hdev) 
}





static int bt3c_hci_send_frame(struct sk_buff *skb)

static int bt3c_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)

{

	bt3c_info_t *info;

	struct hci_dev *hdev = (struct hci_dev *)(skb->dev);

	bt3c_info_t *info = hci_get_drvdata(hdev);

	unsigned long flags;



	if (!hdev) {

		BT_ERR("Frame for unknown HCI device (hdev=NULL)");

		return -ENODEV;

	}



	info = hci_get_drvdata(hdev);



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		hdev->stat.cmd_tx++;
@@ -455,12 +446,6 @@ static int bt3c_hci_send_frame(struct sk_buff *skb) 
}





static int bt3c_hci_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned long arg)

{

	return -ENOIOCTLCMD;

}







/* ======================== Card services HCI interaction ======================== */
@@ -581,7 +566,6 @@ static int bt3c_open(bt3c_info_t *info) 
	hdev->close = bt3c_hci_close;

	hdev->flush = bt3c_hci_flush;

	hdev->send  = bt3c_hci_send_frame;

	hdev->ioctl    = bt3c_hci_ioctl;



	/* Load firmware */

	err = request_firmware(&firmware, "BT3CPCC.bin", &info->p_dev->dev);