Commit 1e55217e 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 3bf671af 7dd6753f

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3362) },

	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0489, 0xe057) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -104,6 +105,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

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

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

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



	/* Atheros AR5BBU22 with sflash firmware */

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

drivers/bluetooth/btusb.c

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ static struct usb_device_id btusb_table[] = { 
	{ USB_DEVICE(0x0a5c, 0x21e6) },

	{ USB_DEVICE(0x0a5c, 0x21e8) },

	{ USB_DEVICE(0x0a5c, 0x21f3) },

	{ USB_DEVICE(0x0a5c, 0x21f4) },

	{ USB_DEVICE(0x413c, 0x8197) },



	/* Foxconn - Hon Hai */
@@ -133,6 +134,7 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

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

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

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



	/* Atheros AR5BBU12 with sflash firmware */

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

drivers/net/wireless/at76c50x-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static int at76_dfu_get_status(struct usb_device *udev, 
	return ret;

}



static u8 at76_dfu_get_state(struct usb_device *udev, u8 *state)

static int at76_dfu_get_state(struct usb_device *udev, u8 *state)

{

	int ret;

drivers/net/wireless/ath/ath5k/base.c

+2 −4
Original line number Diff line number Diff line
@@ -2056,9 +2056,7 @@ ath5k_beacon_update_timers(struct ath5k_hw *ah, u64 bc_tsf) 
void

ath5k_beacon_config(struct ath5k_hw *ah)

{

	unsigned long flags;



	spin_lock_irqsave(&ah->block, flags);

	spin_lock_bh(&ah->block);

	ah->bmisscount = 0;

	ah->imask &= ~(AR5K_INT_BMISS | AR5K_INT_SWBA);
@@ -2085,7 +2083,7 @@ ath5k_beacon_config(struct ath5k_hw *ah) 


	ath5k_hw_set_imr(ah, ah->imask);

	mmiowb();

	spin_unlock_irqrestore(&ah->block, flags);

	spin_unlock_bh(&ah->block);

}



static void ath5k_tasklet_beacon(unsigned long data)

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+2 −3
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ ath5k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	struct ath5k_vif *avf = (void *)vif->drv_priv;

	struct ath5k_hw *ah = hw->priv;

	struct ath_common *common = ath5k_hw_common(ah);

	unsigned long flags;



	mutex_lock(&ah->lock);
@@ -300,9 +299,9 @@ ath5k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	}



	if (changes & BSS_CHANGED_BEACON) {

		spin_lock_irqsave(&ah->block, flags);

		spin_lock_bh(&ah->block);

		ath5k_beacon_update(hw, vif);

		spin_unlock_irqrestore(&ah->block, flags);

		spin_unlock_bh(&ah->block);

	}



	if (changes & BSS_CHANGED_BEACON_ENABLED)