Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 (45ea4ea2) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/DocBook/mac80211.tmpl

+0 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,6 @@ usage should require reading the full document.
		interface in STA mode at first!
		</para>
		!Finclude/net/mac80211.h ieee80211_if_init_conf
		!Finclude/net/mac80211.h ieee80211_if_conf
		</chapter>

		<chapter id="rx-tx">

drivers/net/wireless/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -501,5 +501,6 @@ source "drivers/net/wireless/zd1211rw/Kconfig"
		source "drivers/net/wireless/rt2x00/Kconfig"
		source "drivers/net/wireless/orinoco/Kconfig"
		source "drivers/net/wireless/wl12xx/Kconfig"
		source "drivers/net/wireless/iwmc3200wifi/Kconfig"

		endmenu

drivers/net/wireless/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -60,3 +60,5 @@ obj-$(CONFIG_ATH_COMMON) += ath/
		obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o

		obj-$(CONFIG_WL12XX) += wl12xx/

		obj-$(CONFIG_IWM) += iwmc3200wifi/

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1555,7 +1555,7 @@ static int ar9170_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

		switch (key->alg) {
		case ALG_WEP:
		if (key->keylen == LEN_WEP40)
		if (key->keylen == WLAN_KEY_LEN_WEP40)
		ktype = AR9170_ENC_ALG_WEP64;
		else
		ktype = AR9170_ENC_ALG_WEP128;

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

+40 −14

Original line number	Diff line number	Diff line
		@@ -242,8 +242,8 @@ static int ath5k_get_tx_stats(struct ieee80211_hw *hw,
		static u64 ath5k_get_tsf(struct ieee80211_hw *hw);
		static void ath5k_set_tsf(struct ieee80211_hw *hw, u64 tsf);
		static void ath5k_reset_tsf(struct ieee80211_hw *hw);
		static int ath5k_beacon_update(struct ath5k_softc *sc,
		struct sk_buff *skb);
		static int ath5k_beacon_update(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif);
		static void ath5k_bss_info_changed(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		struct ieee80211_bss_conf *bss_conf,
		@@ -2127,8 +2127,10 @@ ath5k_beacon_send(struct ath5k_softc *sc)
		/* NB: hw still stops DMA, so proceed */
		}

		/* Note: Beacon buffer is updated on beacon_update when mac80211
		* calls config_interface */
		/* refresh the beacon for AP mode */
		if (sc->opmode == NL80211_IFTYPE_AP)
		ath5k_beacon_update(sc->hw, sc->vif);

		ath5k_hw_set_txdp(ah, sc->bhalq, bf->daddr);
		ath5k_hw_start_tx_dma(ah, sc->bhalq);
		ATH5K_DBG(sc, ATH5K_DEBUG_BEACON, "TXDP[%u] = %llx (%p)\n",
		@@ -3047,28 +3049,55 @@ ath5k_reset_tsf(struct ieee80211_hw *hw)
		ath5k_hw_reset_tsf(sc->ah);
		}

		/*
		* Updates the beacon that is sent by ath5k_beacon_send. For adhoc,
		* this is called only once at config_bss time, for AP we do it every
		* SWBA interrupt so that the TIM will reflect buffered frames.
		*
		* Called with the beacon lock.
		*/
		static int
		ath5k_beacon_update(struct ath5k_softc sc, struct sk_buff skb)
		ath5k_beacon_update(struct ieee80211_hw hw, struct ieee80211_vif vif)
		{
		unsigned long flags;
		int ret;
		struct ath5k_softc *sc = hw->priv;
		struct sk_buff *skb = ieee80211_beacon_get(hw, vif);

		if (!skb) {
		ret = -ENOMEM;
		goto out;
		}

		ath5k_debug_dump_skb(sc, skb, "BC ", 1);

		spin_lock_irqsave(&sc->block, flags);
		ath5k_txbuf_free(sc, sc->bbuf);
		sc->bbuf->skb = skb;
		ret = ath5k_beacon_setup(sc, sc->bbuf);
		if (ret)
		sc->bbuf->skb = NULL;
		out:
		return ret;
		}

		/*
		* Update the beacon and reconfigure the beacon queues.
		*/
		static void
		ath5k_beacon_reconfig(struct ieee80211_hw hw, struct ieee80211_vif vif)
		{
		int ret;
		unsigned long flags;
		struct ath5k_softc *sc = hw->priv;

		spin_lock_irqsave(&sc->block, flags);
		ret = ath5k_beacon_update(hw, vif);
		spin_unlock_irqrestore(&sc->block, flags);
		if (!ret) {
		if (ret == 0) {
		ath5k_beacon_config(sc);
		mmiowb();
		}

		return ret;
		}

		static void
		set_beacon_filter(struct ieee80211_hw *hw, bool enable)
		{
		@@ -3118,10 +3147,7 @@ static void ath5k_bss_info_changed(struct ieee80211_hw *hw,
		(vif->type == NL80211_IFTYPE_ADHOC \|\|
		vif->type == NL80211_IFTYPE_MESH_POINT \|\|
		vif->type == NL80211_IFTYPE_AP)) {
		struct sk_buff *beacon = ieee80211_beacon_get(hw, vif);

		if (beacon)
		ath5k_beacon_update(sc, beacon);
		ath5k_beacon_reconfig(hw, vif);
		}

		unlock: