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

Commit 07bc7884 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
parents 47e4df94 13cac152

MAINTAINERS

+5 −4
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ F: drivers/scsi/53c700* 


6LOWPAN GENERIC (BTLE/IEEE 802.15.4)

M:	Alexander Aring <alex.aring@gmail.com>

L:	linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)

L:	linux-bluetooth@vger.kernel.org

L:	linux-wpan@vger.kernel.org

S:	Maintained

F:	net/6lowpan/

F:	include/net/6lowpan.h
@@ -4580,13 +4580,14 @@ F: drivers/idle/i7300_idle.c 


IEEE 802.15.4 SUBSYSTEM

M:	Alexander Aring <alex.aring@gmail.com>

L:	linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)

W:	http://apps.sourceforge.net/trac/linux-zigbee

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git

L:	linux-wpan@vger.kernel.org

W:	https://github.com/linux-wpan

T:	git git://github.com/linux-wpan/linux-wpan-next.git

S:	Maintained

F:	net/ieee802154/

F:	net/mac802154/

F:	drivers/net/ieee802154/

F:	Documentation/networking/ieee802154.txt



IGUANAWORKS USB IR TRANSCEIVER

M:	Sean Young <sean@mess.org>

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x04CA, 0x300b) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0930, 0x0220) },

	{ USB_DEVICE(0x0930, 0x0227) },

	{ USB_DEVICE(0x0b05, 0x17d0) },

	{ USB_DEVICE(0x0CF3, 0x0036) },

	{ USB_DEVICE(0x0CF3, 0x3004) },
@@ -138,6 +139,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },

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

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

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

	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },

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

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

drivers/bluetooth/bluecard_cs.c

+18 −17
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ MODULE_LICENSE("GPL"); 
/* ======================== Local structures ======================== */





typedef struct bluecard_info_t {

struct bluecard_info {

	struct pcmcia_device *p_dev;



	struct hci_dev *hdev;
@@ -78,7 +78,7 @@ typedef struct bluecard_info_t { 


	unsigned char ctrl_reg;

	unsigned long hw_state;		/* Status of the hardware and LED control */

} bluecard_info_t;

};





static int bluecard_config(struct pcmcia_device *link);
@@ -157,7 +157,7 @@ static void bluecard_detach(struct pcmcia_device *p_dev); 


static void bluecard_activity_led_timeout(u_long arg)

{

	bluecard_info_t *info = (bluecard_info_t *)arg;

	struct bluecard_info *info = (struct bluecard_info *)arg;

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



	if (!test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state)))
@@ -173,7 +173,7 @@ static void bluecard_activity_led_timeout(u_long arg) 
}





static void bluecard_enable_activity_led(bluecard_info_t *info)

static void bluecard_enable_activity_led(struct bluecard_info *info)

{

	unsigned int iobase = info->p_dev->resource[0]->start;
@@ -215,7 +215,7 @@ static int bluecard_write(unsigned int iobase, unsigned int offset, __u8 *buf, i 
}





static void bluecard_write_wakeup(bluecard_info_t *info)

static void bluecard_write_wakeup(struct bluecard_info *info)

{

	if (!info) {

		BT_ERR("Unknown device");
@@ -368,7 +368,8 @@ static int bluecard_read(unsigned int iobase, unsigned int offset, __u8 *buf, in 
}





static void bluecard_receive(bluecard_info_t *info, unsigned int offset)

static void bluecard_receive(struct bluecard_info *info,

			     unsigned int offset)

{

	unsigned int iobase;

	unsigned char buf[31];
@@ -497,7 +498,7 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset) 


static irqreturn_t bluecard_interrupt(int irq, void *dev_inst)

{

	bluecard_info_t *info = dev_inst;

	struct bluecard_info *info = dev_inst;

	unsigned int iobase;

	unsigned char reg;
@@ -562,7 +563,7 @@ static irqreturn_t bluecard_interrupt(int irq, void *dev_inst) 


static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud)

{

	bluecard_info_t *info = hci_get_drvdata(hdev);

	struct bluecard_info *info = hci_get_drvdata(hdev);

	struct sk_buff *skb;



	/* Ericsson baud rate command */
@@ -611,7 +612,7 @@ static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud) 


static int bluecard_hci_flush(struct hci_dev *hdev)

{

	bluecard_info_t *info = hci_get_drvdata(hdev);

	struct bluecard_info *info = hci_get_drvdata(hdev);



	/* Drop TX queue */

	skb_queue_purge(&(info->txq));
@@ -622,7 +623,7 @@ static int bluecard_hci_flush(struct hci_dev *hdev) 


static int bluecard_hci_open(struct hci_dev *hdev)

{

	bluecard_info_t *info = hci_get_drvdata(hdev);

	struct bluecard_info *info = hci_get_drvdata(hdev);



	if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state)))

		bluecard_hci_set_baud_rate(hdev, DEFAULT_BAUD_RATE);
@@ -643,7 +644,7 @@ static int bluecard_hci_open(struct hci_dev *hdev) 


static int bluecard_hci_close(struct hci_dev *hdev)

{

	bluecard_info_t *info = hci_get_drvdata(hdev);

	struct bluecard_info *info = hci_get_drvdata(hdev);



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

		return 0;
@@ -663,7 +664,7 @@ static int bluecard_hci_close(struct hci_dev *hdev) 


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

{

	bluecard_info_t *info = hci_get_drvdata(hdev);

	struct bluecard_info *info = hci_get_drvdata(hdev);



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:
@@ -691,7 +692,7 @@ static int bluecard_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 
/* ======================== Card services HCI interaction ======================== */





static int bluecard_open(bluecard_info_t *info)

static int bluecard_open(struct bluecard_info *info)

{

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

	struct hci_dev *hdev;
@@ -806,7 +807,7 @@ static int bluecard_open(bluecard_info_t *info) 
}





static int bluecard_close(bluecard_info_t *info)

static int bluecard_close(struct bluecard_info *info)

{

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

	struct hci_dev *hdev = info->hdev;
@@ -833,7 +834,7 @@ static int bluecard_close(bluecard_info_t *info) 


static int bluecard_probe(struct pcmcia_device *link)

{

	bluecard_info_t *info;

	struct bluecard_info *info;



	/* Create new info device */

	info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL);
@@ -857,7 +858,7 @@ static void bluecard_detach(struct pcmcia_device *link) 


static int bluecard_config(struct pcmcia_device *link)

{

	bluecard_info_t *info = link->priv;

	struct bluecard_info *info = link->priv;

	int i, n;



	link->config_index = 0x20;
@@ -897,7 +898,7 @@ failed: 


static void bluecard_release(struct pcmcia_device *link)

{

	bluecard_info_t *info = link->priv;

	struct bluecard_info *info = link->priv;



	bluecard_close(info);

drivers/bluetooth/bt3c_cs.c

+14 −13
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ MODULE_FIRMWARE("BT3CPCC.bin"); 
/* ======================== Local structures ======================== */





typedef struct bt3c_info_t {

struct bt3c_info {

	struct pcmcia_device *p_dev;



	struct hci_dev *hdev;
@@ -80,7 +80,7 @@ typedef struct bt3c_info_t { 
	unsigned long rx_state;

	unsigned long rx_count;

	struct sk_buff *rx_skb;

} bt3c_info_t;

};





static int bt3c_config(struct pcmcia_device *link);
@@ -175,7 +175,7 @@ static int bt3c_write(unsigned int iobase, int fifo_size, __u8 *buf, int len) 
}





static void bt3c_write_wakeup(bt3c_info_t *info)

static void bt3c_write_wakeup(struct bt3c_info *info)

{

	if (!info) {

		BT_ERR("Unknown device");
@@ -214,7 +214,7 @@ static void bt3c_write_wakeup(bt3c_info_t *info) 
}





static void bt3c_receive(bt3c_info_t *info)

static void bt3c_receive(struct bt3c_info *info)

{

	unsigned int iobase;

	int size = 0, avail;
@@ -336,7 +336,7 @@ static void bt3c_receive(bt3c_info_t *info) 


static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)

{

	bt3c_info_t *info = dev_inst;

	struct bt3c_info *info = dev_inst;

	unsigned int iobase;

	int iir;

	irqreturn_t r = IRQ_NONE;
@@ -388,7 +388,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst) 


static int bt3c_hci_flush(struct hci_dev *hdev)

{

	bt3c_info_t *info = hci_get_drvdata(hdev);

	struct bt3c_info *info = hci_get_drvdata(hdev);



	/* Drop TX queue */

	skb_queue_purge(&(info->txq));
@@ -418,7 +418,7 @@ static int bt3c_hci_close(struct hci_dev *hdev) 


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

{

	bt3c_info_t *info = hci_get_drvdata(hdev);

	struct bt3c_info *info = hci_get_drvdata(hdev);

	unsigned long flags;



	switch (bt_cb(skb)->pkt_type) {
@@ -451,7 +451,8 @@ static int bt3c_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 
/* ======================== Card services HCI interaction ======================== */





static int bt3c_load_firmware(bt3c_info_t *info, const unsigned char *firmware,

static int bt3c_load_firmware(struct bt3c_info *info,

			      const unsigned char *firmware,

			      int count)

{

	char *ptr = (char *) firmware;
@@ -536,7 +537,7 @@ error: 
}





static int bt3c_open(bt3c_info_t *info)

static int bt3c_open(struct bt3c_info *info)

{

	const struct firmware *firmware;

	struct hci_dev *hdev;
@@ -603,7 +604,7 @@ error: 
}





static int bt3c_close(bt3c_info_t *info)

static int bt3c_close(struct bt3c_info *info)

{

	struct hci_dev *hdev = info->hdev;
@@ -620,7 +621,7 @@ static int bt3c_close(bt3c_info_t *info) 


static int bt3c_probe(struct pcmcia_device *link)

{

	bt3c_info_t *info;

	struct bt3c_info *info;



	/* Create new info device */

	info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL);
@@ -683,7 +684,7 @@ static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev, 


static int bt3c_config(struct pcmcia_device *link)

{

	bt3c_info_t *info = link->priv;

	struct bt3c_info *info = link->priv;

	int i;

	unsigned long try;
@@ -724,7 +725,7 @@ failed: 


static void bt3c_release(struct pcmcia_device *link)

{

	bt3c_info_t *info = link->priv;

	struct bt3c_info *info = link->priv;



	bt3c_close(info);

drivers/bluetooth/btuart_cs.c

+14 −13
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ MODULE_LICENSE("GPL"); 
/* ======================== Local structures ======================== */





typedef struct btuart_info_t {

struct btuart_info {

	struct pcmcia_device *p_dev;



	struct hci_dev *hdev;
@@ -75,7 +75,7 @@ typedef struct btuart_info_t { 
	unsigned long rx_state;

	unsigned long rx_count;

	struct sk_buff *rx_skb;

} btuart_info_t;

};





static int btuart_config(struct pcmcia_device *link);
@@ -127,7 +127,7 @@ static int btuart_write(unsigned int iobase, int fifo_size, __u8 *buf, int len) 
}





static void btuart_write_wakeup(btuart_info_t *info)

static void btuart_write_wakeup(struct btuart_info *info)

{

	if (!info) {

		BT_ERR("Unknown device");
@@ -172,7 +172,7 @@ static void btuart_write_wakeup(btuart_info_t *info) 
}





static void btuart_receive(btuart_info_t *info)

static void btuart_receive(struct btuart_info *info)

{

	unsigned int iobase;

	int boguscount = 0;
@@ -286,7 +286,7 @@ static void btuart_receive(btuart_info_t *info) 


static irqreturn_t btuart_interrupt(int irq, void *dev_inst)

{

	btuart_info_t *info = dev_inst;

	struct btuart_info *info = dev_inst;

	unsigned int iobase;

	int boguscount = 0;

	int iir, lsr;
@@ -340,7 +340,8 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst) 
}





static void btuart_change_speed(btuart_info_t *info, unsigned int speed)

static void btuart_change_speed(struct btuart_info *info,

				unsigned int speed)

{

	unsigned long flags;

	unsigned int iobase;
@@ -397,7 +398,7 @@ static void btuart_change_speed(btuart_info_t *info, unsigned int speed) 


static int btuart_hci_flush(struct hci_dev *hdev)

{

	btuart_info_t *info = hci_get_drvdata(hdev);

	struct btuart_info *info = hci_get_drvdata(hdev);



	/* Drop TX queue */

	skb_queue_purge(&(info->txq));
@@ -427,7 +428,7 @@ static int btuart_hci_close(struct hci_dev *hdev) 


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

{

	btuart_info_t *info = hci_get_drvdata(hdev);

	struct btuart_info *info = hci_get_drvdata(hdev);



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:
@@ -455,7 +456,7 @@ static int btuart_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 
/* ======================== Card services HCI interaction ======================== */





static int btuart_open(btuart_info_t *info)

static int btuart_open(struct btuart_info *info)

{

	unsigned long flags;

	unsigned int iobase = info->p_dev->resource[0]->start;
@@ -521,7 +522,7 @@ static int btuart_open(btuart_info_t *info) 
}





static int btuart_close(btuart_info_t *info)

static int btuart_close(struct btuart_info *info)

{

	unsigned long flags;

	unsigned int iobase = info->p_dev->resource[0]->start;
@@ -550,7 +551,7 @@ static int btuart_close(btuart_info_t *info) 


static int btuart_probe(struct pcmcia_device *link)

{

	btuart_info_t *info;

	struct btuart_info *info;



	/* Create new info device */

	info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL);
@@ -613,7 +614,7 @@ static int btuart_check_config_notpicky(struct pcmcia_device *p_dev, 


static int btuart_config(struct pcmcia_device *link)

{

	btuart_info_t *info = link->priv;

	struct btuart_info *info = link->priv;

	int i;

	int try;
@@ -654,7 +655,7 @@ failed: 


static void btuart_release(struct pcmcia_device *link)

{

	btuart_info_t *info = link->priv;

	struct btuart_info *info = link->priv;



	btuart_close(info);