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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ed3b856b fa809e2f

drivers/bluetooth/ath3k.c

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static struct usb_device_id ath3k_table[] = { 


	/* Atheros AR3011 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x3002) },

	{ USB_DEVICE(0x0CF3, 0xE019) },

	{ USB_DEVICE(0x13d3, 0x3304) },

	{ USB_DEVICE(0x0930, 0x0215) },

	{ USB_DEVICE(0x0489, 0xE03D) },
@@ -77,6 +78,7 @@ static struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x04CA, 0x3005) },

	{ USB_DEVICE(0x13d3, 0x3362) },

	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0930, 0x0219) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -101,6 +103,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU22 with sflash firmware */

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

drivers/bluetooth/btmrvl_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ int btmrvl_remove_card(struct btmrvl_private *priv); 


void btmrvl_interrupt(struct btmrvl_private *priv);



void btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb);

bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb);

int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb);



int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd);

drivers/bluetooth/btmrvl_main.c

+12 −2
Original line number Diff line number Diff line
@@ -44,24 +44,34 @@ void btmrvl_interrupt(struct btmrvl_private *priv) 
}

EXPORT_SYMBOL_GPL(btmrvl_interrupt);



void btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)

bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)

{

	struct hci_event_hdr *hdr = (void *) skb->data;

	struct hci_ev_cmd_complete *ec;

	u16 opcode, ocf;

	u16 opcode, ocf, ogf;



	if (hdr->evt == HCI_EV_CMD_COMPLETE) {

		ec = (void *) (skb->data + HCI_EVENT_HDR_SIZE);

		opcode = __le16_to_cpu(ec->opcode);

		ocf = hci_opcode_ocf(opcode);

		ogf = hci_opcode_ogf(opcode);



		if (ocf == BT_CMD_MODULE_CFG_REQ &&

					priv->btmrvl_dev.sendcmdflag) {

			priv->btmrvl_dev.sendcmdflag = false;

			priv->adapter->cmd_complete = true;

			wake_up_interruptible(&priv->adapter->cmd_wait_q);

		}



		if (ogf == OGF) {

			BT_DBG("vendor event skipped: ogf 0x%4.4x", ogf);

			kfree_skb(skb);

			return false;

		}

	}



	return true;

}

EXPORT_SYMBOL_GPL(btmrvl_check_evtpkt);



int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)

drivers/bluetooth/btmrvl_sdio.c

+5 −3
Original line number Diff line number Diff line
@@ -565,10 +565,12 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv) 
		skb_put(skb, buf_len);

		skb_pull(skb, SDIO_HEADER_LEN);



		if (type == HCI_EVENT_PKT)

			btmrvl_check_evtpkt(priv, skb);



		if (type == HCI_EVENT_PKT) {

			if (btmrvl_check_evtpkt(priv, skb))

				hci_recv_frame(skb);

		} else

			hci_recv_frame(skb);



		hdev->stat.byte_rx += buf_len;

		break;

drivers/bluetooth/btusb.c

+2 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static struct usb_device_id blacklist_table[] = { 


	/* Atheros 3011 with sflash firmware */

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

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

	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
@@ -131,6 +132,7 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },