Commit 26c6e808 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 6fc4adca d61f978b

drivers/bluetooth/ath3k.c

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

	{ USB_DEVICE(0x0930, 0x0215) },

	{ USB_DEVICE(0x0489, 0xE03D) },

	{ USB_DEVICE(0x0489, 0xE027) },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03F0, 0x311D) },

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },

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

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

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



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -4401,7 +4401,7 @@ static s32 brcmf_mode_to_nl80211_iftype(s32 mode) 


static void brcmf_wiphy_pno_params(struct wiphy *wiphy)

{

#ifndef CONFIG_BRCMFISCAN

#ifndef CONFIG_BRCMISCAN

	/* scheduled scan settings */

	wiphy->max_sched_scan_ssids = BRCMF_PNO_MAX_PFN_COUNT;

	wiphy->max_match_sets = BRCMF_PNO_MAX_PFN_COUNT;

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static void iwlagn_mac_tx(struct ieee80211_hw *hw, 
		     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);



	if (iwlagn_tx_skb(priv, control->sta, skb))

		dev_kfree_skb_any(skb);

		ieee80211_free_txskb(hw, skb);

}



static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,

drivers/net/wireless/iwlwifi/dvm/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2114,7 +2114,7 @@ static void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb) 


	info = IEEE80211_SKB_CB(skb);

	iwl_trans_free_tx_cmd(priv->trans, info->driver_data[1]);

	dev_kfree_skb_any(skb);

	ieee80211_free_txskb(priv->hw, skb);

}



static void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)