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

Commit e2e6be56 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 into for-davem
parents bc909d9d 8b2a3827

drivers/bcma/main.c

+12 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ MODULE_LICENSE("GPL"); 
static int bcma_bus_match(struct device *dev, struct device_driver *drv);

static int bcma_device_probe(struct device *dev);

static int bcma_device_remove(struct device *dev);

static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env);



static ssize_t manuf_show(struct device *dev, struct device_attribute *attr, char *buf)

{
@@ -49,6 +50,7 @@ static struct bus_type bcma_bus_type = { 
	.match		= bcma_bus_match,

	.probe		= bcma_device_probe,

	.remove		= bcma_device_remove,

	.uevent		= bcma_device_uevent,

	.dev_attrs	= bcma_device_attrs,

};
@@ -227,6 +229,16 @@ static int bcma_device_remove(struct device *dev) 
	return 0;

}



static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	struct bcma_device *core = container_of(dev, struct bcma_device, dev);



	return add_uevent_var(env,

			      "MODALIAS=bcma:m%04Xid%04Xrev%02Xcl%02X",

			      core->id.manuf, core->id.id,

			      core->id.rev, core->id.class);

}



static int __init bcma_modinit(void)

{

	int err;

drivers/bluetooth/ath3k.c

+1 −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(0x13d3, 0x3304) },

	{ USB_DEVICE(0x0930, 0x0215) },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03F0, 0x311D) },

drivers/bluetooth/btusb.c

+10 −3
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ static struct usb_device_id blacklist_table[] = { 
	/* Atheros 3011 with sflash firmware */

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

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

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



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
@@ -256,7 +257,9 @@ static void btusb_intr_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

		/* -EPERM: urb is being killed;

		 * -ENODEV: device got disconnected */

		if (err != -EPERM && err != -ENODEV)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);
@@ -341,7 +344,9 @@ static void btusb_bulk_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

		/* -EPERM: urb is being killed;

		 * -ENODEV: device got disconnected */

		if (err != -EPERM && err != -ENODEV)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);
@@ -431,7 +436,9 @@ static void btusb_isoc_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

		/* -EPERM: urb is being killed;

		 * -ENODEV: device got disconnected */

		if (err != -EPERM && err != -ENODEV)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);

drivers/net/wireless/ath/ath9k/ar9003_eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int ar9003_hw_power_interpolate(int32_t x, 
static const struct ar9300_eeprom ar9300_default = {

	.eepromVersion = 2,

	.templateVersion = 2,

	.macAddr = {1, 2, 3, 4, 5, 6},

	.macAddr = {0, 2, 3, 4, 5, 6},

	.custData = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

		     0, 0, 0, 0, 0, 0, 0, 0, 0, 0},

	.baseEepHeader = {

drivers/net/wireless/ath/ath9k/main.c

+4 −0
Original line number Diff line number Diff line
@@ -2283,7 +2283,11 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class) 


	mutex_lock(&sc->mutex);

	ah->coverage_class = coverage_class;



	ath9k_ps_wakeup(sc);

	ath9k_hw_init_global_settings(ah);

	ath9k_ps_restore(sc);



	mutex_unlock(&sc->mutex);

}