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

Commit 9a638ddf authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'mac80211-next-for-john-2014-11-20' of... 

Merge tag 'mac80211-next-for-john-2014-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg <johannes@sipsolutions.net> says:

"It has been a while since my last pull request, so we accumulated
another relatively large set of changes:
 * TDLS off-channel support set from Arik/Liad, with some support
   patches I did
 * custom regulatory fixes from Arik
 * minstrel VHT fix (and a small optimisation) from Felix
 * add back radiotap vendor namespace support (myself)
 * random MAC address scanning for cfg80211/mac80211/hwsim (myself)
 * CSA improvements (Luca)
 * WoWLAN Net Detect (wake on network found) support (Luca)
 * and lots of other smaller changes from many people"

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents b4c1b708 75769c80

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

+4 −2
Original line number Diff line number Diff line
@@ -547,7 +547,9 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 




static void

ath5k_sw_scan_start(struct ieee80211_hw *hw)

ath5k_sw_scan_start(struct ieee80211_hw *hw,

		    struct ieee80211_vif *vif,

		    const u8 *mac_addr)

{

	struct ath5k_hw *ah = hw->priv;

	if (!ah->assoc)
@@ -556,7 +558,7 @@ ath5k_sw_scan_start(struct ieee80211_hw *hw) 




static void

ath5k_sw_scan_complete(struct ieee80211_hw *hw)

ath5k_sw_scan_complete(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

{

	struct ath5k_hw *ah = hw->priv;

	ath5k_hw_set_ledstate(ah, ah->assoc ?

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

+1 −1
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ static void ath_scan_send_probe(struct ath_softc *sc, 
	struct ieee80211_tx_info *info;

	int band = sc->offchannel.chan.chandef.chan->band;



	skb = ieee80211_probereq_get(sc->hw, vif,

	skb = ieee80211_probereq_get(sc->hw, vif->addr,

			ssid->ssid, ssid->ssid_len, req->ie_len);

	if (!skb)

		return;

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

+5 −2
Original line number Diff line number Diff line
@@ -1691,7 +1691,9 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw, 
	return ret;

}



static void ath9k_htc_sw_scan_start(struct ieee80211_hw *hw)

static void ath9k_htc_sw_scan_start(struct ieee80211_hw *hw,

				    struct ieee80211_vif *vif,

				    const u8 *mac_addr)

{

	struct ath9k_htc_priv *priv = hw->priv;

	struct ath_common *common = ath9k_hw_common(priv->ah);
@@ -1705,7 +1707,8 @@ static void ath9k_htc_sw_scan_start(struct ieee80211_hw *hw) 
	mutex_unlock(&priv->mutex);

}



static void ath9k_htc_sw_scan_complete(struct ieee80211_hw *hw)

static void ath9k_htc_sw_scan_complete(struct ieee80211_hw *hw,

				       struct ieee80211_vif *vif)

{

	struct ath9k_htc_priv *priv = hw->priv;

	struct ath_common *common = ath9k_hw_common(priv->ah);

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

+5 −2
Original line number Diff line number Diff line
@@ -2183,14 +2183,17 @@ static int ath9k_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant) 
	return 0;

}



static void ath9k_sw_scan_start(struct ieee80211_hw *hw)

static void ath9k_sw_scan_start(struct ieee80211_hw *hw,

				struct ieee80211_vif *vif,

				const u8 *mac_addr)

{

	struct ath_softc *sc = hw->priv;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	set_bit(ATH_OP_SCANNING, &common->op_flags);

}



static void ath9k_sw_scan_complete(struct ieee80211_hw *hw)

static void ath9k_sw_scan_complete(struct ieee80211_hw *hw,

				   struct ieee80211_vif *vif)

{

	struct ath_softc *sc = hw->priv;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

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

+5 −2
Original line number Diff line number Diff line
@@ -494,7 +494,9 @@ static int wcn36xx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	return ret;

}



static void wcn36xx_sw_scan_start(struct ieee80211_hw *hw)

static void wcn36xx_sw_scan_start(struct ieee80211_hw *hw,

				  struct ieee80211_vif *vif,

				  const u8 *mac_addr)

{

	struct wcn36xx *wcn = hw->priv;
@@ -502,7 +504,8 @@ static void wcn36xx_sw_scan_start(struct ieee80211_hw *hw) 
	wcn36xx_smd_start_scan(wcn);

}



static void wcn36xx_sw_scan_complete(struct ieee80211_hw *hw)

static void wcn36xx_sw_scan_complete(struct ieee80211_hw *hw,

				     struct ieee80211_vif *vif)

{

	struct wcn36xx *wcn = hw->priv;