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

Commit 0c490874 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2015-01-19' of... 

Merge tag 'mac80211-next-for-davem-2015-01-19' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Some further updates for net-next:
 * fix network-manager which was broken by the previous changes
 * fix delete-station events, which were broken by me making the
   genlmsg_end() mistake
 * fix a timer left running during suspend in some race conditions
   that would cause an annoying (but harmless) warning
 * (less important, but in the tree already) remove 80+80 MHz rate
   reporting since the spec doesn't distinguish it from 160 MHz;
   as the bitrate they're both 160 MHz bandwidth

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 926e9878 c1e140bf

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −1
Original line number Diff line number Diff line
@@ -1827,6 +1827,7 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, 
		}



		sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS;

		sinfo->txrate.bw = RATE_INFO_BW_20;

	} else if (is_rate_ht40(rate, &mcs, &sgi)) {

		if (sgi) {

			sinfo->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
@@ -1835,7 +1836,7 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, 
			sinfo->txrate.mcs = mcs;

		}



		sinfo->txrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;

		sinfo->txrate.bw = RATE_INFO_BW_40;

		sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS;

	} else {

		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,

drivers/net/wireless/mwifiex/cfg80211.c

+6 −5
Original line number Diff line number Diff line
@@ -856,16 +856,16 @@ mwifiex_parse_htinfo(struct mwifiex_private *priv, u8 tx_htinfo, 
			/* HT or VHT */

			switch (tx_htinfo & (BIT(3) | BIT(2))) {

			case 0:

				/* This will be 20MHz */

				rate->bw = RATE_INFO_BW_20;

				break;

			case (BIT(2)):

				rate->flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;

				rate->bw = RATE_INFO_BW_40;

				break;

			case (BIT(3)):

				rate->flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH;

				rate->bw = RATE_INFO_BW_80;

				break;

			case (BIT(3) | BIT(2)):

				rate->flags |= RATE_INFO_FLAGS_160_MHZ_WIDTH;

				rate->bw = RATE_INFO_BW_160;

				break;

			}
@@ -885,8 +885,9 @@ mwifiex_parse_htinfo(struct mwifiex_private *priv, u8 tx_htinfo, 
		if ((tx_htinfo & BIT(0)) && (priv->tx_rate < 16)) {

			rate->mcs = priv->tx_rate;

			rate->flags |= RATE_INFO_FLAGS_MCS;

			rate->bw = RATE_INFO_BW_20;

			if (tx_htinfo & BIT(1))

				rate->flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;

				rate->bw = RATE_INFO_BW_40;

			if (tx_htinfo & BIT(2))

				rate->flags |= RATE_INFO_FLAGS_SHORT_GI;

		}

include/net/cfg80211.h

+25 −10
Original line number Diff line number Diff line
@@ -873,22 +873,35 @@ int cfg80211_check_station_change(struct wiphy *wiphy, 
 *

 * @RATE_INFO_FLAGS_MCS: mcs field filled with HT MCS

 * @RATE_INFO_FLAGS_VHT_MCS: mcs field filled with VHT MCS

 * @RATE_INFO_FLAGS_40_MHZ_WIDTH: 40 MHz width transmission

 * @RATE_INFO_FLAGS_80_MHZ_WIDTH: 80 MHz width transmission

 * @RATE_INFO_FLAGS_80P80_MHZ_WIDTH: 80+80 MHz width transmission

 * @RATE_INFO_FLAGS_160_MHZ_WIDTH: 160 MHz width transmission

 * @RATE_INFO_FLAGS_SHORT_GI: 400ns guard interval

 * @RATE_INFO_FLAGS_60G: 60GHz MCS

 */

enum rate_info_flags {

	RATE_INFO_FLAGS_MCS			= BIT(0),

	RATE_INFO_FLAGS_VHT_MCS			= BIT(1),

	RATE_INFO_FLAGS_40_MHZ_WIDTH		= BIT(2),

	RATE_INFO_FLAGS_80_MHZ_WIDTH		= BIT(3),

	RATE_INFO_FLAGS_80P80_MHZ_WIDTH		= BIT(4),

	RATE_INFO_FLAGS_160_MHZ_WIDTH		= BIT(5),

	RATE_INFO_FLAGS_SHORT_GI		= BIT(6),

	RATE_INFO_FLAGS_60G			= BIT(7),

	RATE_INFO_FLAGS_SHORT_GI		= BIT(2),

	RATE_INFO_FLAGS_60G			= BIT(3),

};



/**

 * enum rate_info_bw - rate bandwidth information

 *

 * Used by the driver to indicate the rate bandwidth.

 *

 * @RATE_INFO_BW_5: 5 MHz bandwidth

 * @RATE_INFO_BW_10: 10 MHz bandwidth

 * @RATE_INFO_BW_20: 20 MHz bandwidth

 * @RATE_INFO_BW_40: 40 MHz bandwidth

 * @RATE_INFO_BW_80: 80 MHz bandwidth

 * @RATE_INFO_BW_160: 160 MHz bandwidth

 */

enum rate_info_bw {

	RATE_INFO_BW_5,

	RATE_INFO_BW_10,

	RATE_INFO_BW_20,

	RATE_INFO_BW_40,

	RATE_INFO_BW_80,

	RATE_INFO_BW_160,

};



/**
@@ -900,12 +913,14 @@ enum rate_info_flags { 
 * @mcs: mcs index if struct describes a 802.11n bitrate

 * @legacy: bitrate in 100kbit/s for 802.11abg

 * @nss: number of streams (VHT only)

 * @bw: bandwidth (from &enum rate_info_bw)

 */

struct rate_info {

	u8 flags;

	u8 mcs;

	u16 legacy;

	u8 nss;

	u8 bw;

};



/**

include/net/mac80211.h

+2 −4
Original line number Diff line number Diff line
@@ -931,15 +931,13 @@ enum mac80211_rx_flags { 
 * These flags are used with the @vht_flag member of

 *	&struct ieee80211_rx_status.

 * @RX_VHT_FLAG_80MHZ: 80 MHz was used

 * @RX_VHT_FLAG_80P80MHZ: 80+80 MHz was used

 * @RX_VHT_FLAG_160MHZ: 160 MHz was used

 * @RX_VHT_FLAG_BF: packet was beamformed

 */

enum mac80211_rx_vht_flags {

	RX_VHT_FLAG_80MHZ		= BIT(0),

	RX_VHT_FLAG_80P80MHZ		= BIT(1),

	RX_VHT_FLAG_160MHZ		= BIT(2),

	RX_VHT_FLAG_BF			= BIT(3),

	RX_VHT_FLAG_160MHZ		= BIT(1),

	RX_VHT_FLAG_BF			= BIT(2),

};



/**

include/uapi/linux/nl80211.h

+10 −1
Original line number Diff line number Diff line
@@ -2278,8 +2278,15 @@ struct nl80211_sta_flag_update { 
 * @NL80211_RATE_INFO_VHT_MCS: MCS index for VHT (u8)

 * @NL80211_RATE_INFO_VHT_NSS: number of streams in VHT (u8)

 * @NL80211_RATE_INFO_80_MHZ_WIDTH: 80 MHz VHT rate

 * @NL80211_RATE_INFO_80P80_MHZ_WIDTH: 80+80 MHz VHT rate

 * @NL80211_RATE_INFO_80P80_MHZ_WIDTH: unused - 80+80 is treated the

 *	same as 160 for purposes of the bitrates

 * @NL80211_RATE_INFO_160_MHZ_WIDTH: 160 MHz VHT rate

 * @NL80211_RATE_INFO_10_MHZ_WIDTH: 10 MHz width - note that this is

 *	a legacy rate and will be reported as the actual bitrate, i.e.

 *	half the base (20 MHz) rate

 * @NL80211_RATE_INFO_5_MHZ_WIDTH: 5 MHz width - note that this is

 *	a legacy rate and will be reported as the actual bitrate, i.e.

 *	a quarter of the base (20 MHz) rate

 * @__NL80211_RATE_INFO_AFTER_LAST: internal use

 */

enum nl80211_rate_info {
@@ -2294,6 +2301,8 @@ enum nl80211_rate_info { 
	NL80211_RATE_INFO_80_MHZ_WIDTH,

	NL80211_RATE_INFO_80P80_MHZ_WIDTH,

	NL80211_RATE_INFO_160_MHZ_WIDTH,

	NL80211_RATE_INFO_10_MHZ_WIDTH,

	NL80211_RATE_INFO_5_MHZ_WIDTH,



	/* keep last */

	__NL80211_RATE_INFO_AFTER_LAST,