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

Commit 41ebe9cd authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

parents fd38f734 5c1381ac

Documentation/networking/mac80211-injection.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,10 @@ radiotap headers and used to control injection: 
   IEEE80211_RADIOTAP_F_FRAG: frame will be fragmented if longer than the

   IEEE80211_RADIOTAP_F_FRAG: frame will be fragmented if longer than the

			      current fragmentation threshold.

			      current fragmentation threshold.





 * IEEE80211_RADIOTAP_TX_FLAGS



   IEEE80211_RADIOTAP_F_TX_NOACK: frame should be sent without waiting for

				  an ACK even if it is a unicast frame





The injection code can also skip all other currently defined radiotap fields

The injection code can also skip all other currently defined radiotap fields

facilitating replay of captured radiotap headers directly.

facilitating replay of captured radiotap headers directly.

drivers/net/wireless/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -271,6 +271,7 @@ config MWL8K 
source "drivers/net/wireless/ath/Kconfig"

source "drivers/net/wireless/ath/Kconfig"

source "drivers/net/wireless/b43/Kconfig"

source "drivers/net/wireless/b43/Kconfig"

source "drivers/net/wireless/b43legacy/Kconfig"

source "drivers/net/wireless/b43legacy/Kconfig"

source "drivers/net/wireless/brcm80211/Kconfig"

source "drivers/net/wireless/hostap/Kconfig"

source "drivers/net/wireless/hostap/Kconfig"

source "drivers/net/wireless/ipw2x00/Kconfig"

source "drivers/net/wireless/ipw2x00/Kconfig"

source "drivers/net/wireless/iwlwifi/Kconfig"

source "drivers/net/wireless/iwlwifi/Kconfig"

drivers/net/wireless/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -58,3 +58,6 @@ obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx/ 
obj-$(CONFIG_IWM)	+= iwmc3200wifi/

obj-$(CONFIG_IWM)	+= iwmc3200wifi/





obj-$(CONFIG_MWIFIEX)	+= mwifiex/

obj-$(CONFIG_MWIFIEX)	+= mwifiex/

obj-$(CONFIG_BRCMFMAC) += brcm80211/

obj-$(CONFIG_BRCMUMAC) += brcm80211/

obj-$(CONFIG_BRCMSMAC) += brcm80211/

drivers/net/wireless/ath/ath.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -71,9 +71,7 @@ struct ath_regulatory { 
	char alpha2[2];

	char alpha2[2];

	u16 country_code;

	u16 country_code;

	u16 max_power_level;

	u16 max_power_level;

	u32 tp_scale;

	u16 current_rd;

	u16 current_rd;

	u16 current_rd_ext;

	int16_t power_limit;

	int16_t power_limit;

	struct reg_dmn_pair_mapping *regpair;

	struct reg_dmn_pair_mapping *regpair;

};

};

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -921,12 +921,6 @@ ath5k_txq_setup(struct ath5k_hw *ah, 
		 */

		 */

		return ERR_PTR(qnum);

		return ERR_PTR(qnum);

	}

	}

	if (qnum >= ARRAY_SIZE(ah->txqs)) {

		ATH5K_ERR(ah, "hw qnum %u out of range, max %tu!\n",

			qnum, ARRAY_SIZE(ah->txqs));

		ath5k_hw_release_tx_queue(ah, qnum);

		return ERR_PTR(-EINVAL);

	}

	txq = &ah->txqs[qnum];

	txq = &ah->txqs[qnum];

	if (!txq->setup) {

	if (!txq->setup) {

		txq->qnum = qnum;

		txq->qnum = qnum;