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

Merge tag 'master-2014-10-27' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
pull request: wireless 2014-10-28

Please pull this batch of fixes intended for the 3.18 stream!

For the mac80211 bits, Johannes says:

"Here are a few fixes for the wireless stack: one fixes the
RTS rate, one for a debugfs file, one to return the correct
channel to userspace, a sanity check for a userspace value
and the remaining two are just documentation fixes."

For the iwlwifi bits, Emmanuel says:

"I revert here a patch that caused interoperability issues.
dvm gets a fix for a bug that was reported by many users.
Two minor fixes for BT Coex and platform power fix that helps
reducing latency when the PCIe link goes to low power states."

In addition...

Felix Fietkau adds a couple of ath code fixes related to regulatory
rule enforcement.

Hauke Mehrtens fixes a build break with bcma when CONFIG_OF_ADDRESS
is not set.

Karsten Wiese provides a trio of minor fixes for rtl8192cu.

Kees Cook prevents a potential information leak in rtlwifi.

Larry Finger also brings a trio of minor fixes for rtlwifi.

Rafał Miłecki adds a device ID to the bcma bus driver.

Rickard Strandqvist offers some strn* -> strl* changes in brcmfmac
to eliminate non-terminated string issues.

Sujith Manoharan avoids some ath9k stalls by enabling HW queue control
only for MCC.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3923d68d 99c81406

drivers/bcma/host_pci.c

+3 −2
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend, 
static const struct pci_device_id bcma_pci_bridge_tbl[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },	/* 0xa8d8 */

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
@@ -285,7 +285,8 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },	/* 0xA8DB */

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },	/* 0xa8db, BCM43217 (sic!) */

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43228) },	/* 0xa8dc */

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);

drivers/bcma/main.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static bool bcma_is_core_needed_early(u16 core_id) 
	return false;

}



#ifdef CONFIG_OF

#if defined(CONFIG_OF) && defined(CONFIG_OF_ADDRESS)

static struct device_node *bcma_of_find_child_device(struct platform_device *parent,

						     struct bcma_device *core)

{

drivers/net/wireless/ath/ath.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct reg_dmn_pair_mapping { 


struct ath_regulatory {

	char alpha2[2];

	enum nl80211_dfs_regions region;

	u16 country_code;

	u16 max_power_level;

	u16 current_rd;

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

+4 −4
Original line number Diff line number Diff line
@@ -368,12 +368,12 @@ void ath9k_cmn_update_txpow(struct ath_hw *ah, u16 cur_txpow, 
{

	struct ath_regulatory *reg = ath9k_hw_regulatory(ah);



	if (reg->power_limit != new_txpow) {

	if (reg->power_limit != new_txpow)

		ath9k_hw_set_txpowerlimit(ah, new_txpow, false);



	/* read back in case value is clamped */

	*txpower = reg->max_power_level;

}

}

EXPORT_SYMBOL(ath9k_cmn_update_txpow);



void ath9k_cmn_init_crypto(struct ath_hw *ah)

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

+30 −25
Original line number Diff line number Diff line
@@ -734,6 +734,32 @@ static const struct ieee80211_iface_combination if_comb[] = { 
#endif

};



#ifdef CONFIG_ATH9K_CHANNEL_CONTEXT

static void ath9k_set_mcc_capab(struct ath_softc *sc, struct ieee80211_hw *hw)

{

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);



	if (!ath9k_is_chanctx_enabled())

		return;



	hw->flags |= IEEE80211_HW_QUEUE_CONTROL;

	hw->queues = ATH9K_NUM_TX_QUEUES;

	hw->offchannel_tx_hw_queue = hw->queues - 1;

	hw->wiphy->interface_modes &= ~ BIT(NL80211_IFTYPE_WDS);

	hw->wiphy->iface_combinations = if_comb_multi;

	hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb_multi);

	hw->wiphy->max_scan_ssids = 255;

	hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;

	hw->wiphy->max_remain_on_channel_duration = 10000;

	hw->chanctx_data_size = sizeof(void *);

	hw->extra_beacon_tailroom =

		sizeof(struct ieee80211_p2p_noa_attr) + 9;



	ath_dbg(common, CHAN_CTX, "Use channel contexts\n");

}

#endif /* CONFIG_ATH9K_CHANNEL_CONTEXT */



static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)

{

	struct ath_hw *ah = sc->sc_ah;
@@ -746,7 +772,6 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 
		IEEE80211_HW_SPECTRUM_MGMT |

		IEEE80211_HW_REPORTS_TX_ACK_STATUS |

		IEEE80211_HW_SUPPORTS_RC_TABLE |

		IEEE80211_HW_QUEUE_CONTROL |

		IEEE80211_HW_SUPPORTS_HT_CCK_RATES;



	if (ath9k_ps_enable)
@@ -781,24 +806,6 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 
			hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);

	}



#ifdef CONFIG_ATH9K_CHANNEL_CONTEXT



	if (ath9k_is_chanctx_enabled()) {

		hw->wiphy->interface_modes &= ~ BIT(NL80211_IFTYPE_WDS);

		hw->wiphy->iface_combinations = if_comb_multi;

		hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb_multi);

		hw->wiphy->max_scan_ssids = 255;

		hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;

		hw->wiphy->max_remain_on_channel_duration = 10000;

		hw->chanctx_data_size = sizeof(void *);

		hw->extra_beacon_tailroom =

			sizeof(struct ieee80211_p2p_noa_attr) + 9;



		ath_dbg(common, CHAN_CTX, "Use channel contexts\n");

	}



#endif /* CONFIG_ATH9K_CHANNEL_CONTEXT */



	hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;



	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
@@ -808,12 +815,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 
	hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;

	hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;



	/* allow 4 queues per channel context +

	 * 1 cab queue + 1 offchannel tx queue

	 */

	hw->queues = ATH9K_NUM_TX_QUEUES;

	/* last queue for offchannel */

	hw->offchannel_tx_hw_queue = hw->queues - 1;

	hw->queues = 4;

	hw->max_rates = 4;

	hw->max_listen_interval = 10;

	hw->max_rate_tries = 10;
@@ -837,6 +839,9 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 
		hw->wiphy->bands[IEEE80211_BAND_5GHZ] =

			&common->sbands[IEEE80211_BAND_5GHZ];



#ifdef CONFIG_ATH9K_CHANNEL_CONTEXT

	ath9k_set_mcc_capab(sc, hw);

#endif

	ath9k_init_wow(hw);

	ath9k_cmn_reload_chainmask(ah);

CRA Git | Maintained and supported by SUSTech CRA and CCSE