Commit ea1b2b45 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove short slot/short preamble incapable flags 



There are no drivers setting IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE
or IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE, so any code using the
two flags is dead; it's also exceedingly unlikely that any new driver
could ever need to set these flags.

The wcn36xx code is almost certainly broken, but this preserves the
previous behaviour.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3b79af97

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

+1 −3
Original line number Diff line number Diff line
@@ -216,9 +216,7 @@ static void wcn36xx_smd_set_sta_params(struct wcn36xx *wcn, 
		memcpy(&sta_params->bssid, vif->addr, ETH_ALEN);



	sta_params->encrypt_type = priv_vif->encrypt_type;

	sta_params->short_preamble_supported =

		!(WCN36XX_FLAGS(wcn) &

		  IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE);

	sta_params->short_preamble_supported = true;



	sta_params->rifs_mode = 0;

	sta_params->rmf = 0;

include/net/mac80211.h

+2 −15
Original line number Diff line number Diff line
@@ -446,12 +446,8 @@ struct ieee80211_event { 
 * @ibss_creator: indicates if a new IBSS network is being created

 * @aid: association ID number, valid only when @assoc is true

 * @use_cts_prot: use CTS protection

 * @use_short_preamble: use 802.11b short preamble;

 *	if the hardware cannot handle this it must set the

 *	IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE hardware flag

 * @use_short_slot: use short slot time (only relevant for ERP);

 *	if the hardware cannot handle this it must set the

 *	IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE hardware flag

 * @use_short_preamble: use 802.11b short preamble

 * @use_short_slot: use short slot time (only relevant for ERP)

 * @dtim_period: num of beacons before the next DTIM, for beaconing,

 *	valid in station mode only if after the driver was notified

 *	with the %BSS_CHANGED_BEACON_INFO flag, will be non-zero then.
@@ -1784,13 +1780,6 @@ struct ieee80211_txq { 
 *	multicast frames when there are power saving stations so that

 *	the driver can fetch them with ieee80211_get_buffered_bc().

 *

 * @IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE:

 *	Hardware is not capable of short slot operation on the 2.4 GHz band.

 *

 * @IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE:

 *	Hardware is not capable of receiving frames with short preamble on

 *	the 2.4 GHz band.

 *

 * @IEEE80211_HW_SIGNAL_UNSPEC:

 *	Hardware can provide signal values but we don't know its units. We

 *	expect values between 0 and @max_signal.
@@ -1903,8 +1892,6 @@ enum ieee80211_hw_flags { 
	IEEE80211_HW_HAS_RATE_CONTROL			= 1<<0,

	IEEE80211_HW_RX_INCLUDES_FCS			= 1<<1,

	IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING	= 1<<2,

	IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE		= 1<<3,

	IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE	= 1<<4,

	IEEE80211_HW_SIGNAL_UNSPEC			= 1<<5,

	IEEE80211_HW_SIGNAL_DBM				= 1<<6,

	IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC		= 1<<7,

net/mac80211/debugfs.c

+0 −7
Original line number Diff line number Diff line 


/*

 * mac80211 debugfs for wireless PHYs

 *
@@ -112,12 +111,6 @@ static ssize_t hwflags_read(struct file *file, char __user *user_buf, 
	if (local->hw.flags & IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING)

		sf += scnprintf(buf + sf, mxln - sf,

				"HOST_BCAST_PS_BUFFERING\n");

	if (local->hw.flags & IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE)

		sf += scnprintf(buf + sf, mxln - sf,

				"2GHZ_SHORT_SLOT_INCAPABLE\n");

	if (local->hw.flags & IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE)

		sf += scnprintf(buf + sf, mxln - sf,

				"2GHZ_SHORT_PREAMBLE_INCAPABLE\n");

	if (local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)

		sf += scnprintf(buf + sf, mxln - sf, "SIGNAL_UNSPEC\n");

	if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)

net/mac80211/mesh_plink.c

+1 −3
Original line number Diff line number Diff line
@@ -106,9 +106,7 @@ static u32 mesh_set_short_slot_time(struct ieee80211_sub_if_data *sdata) 
		/* (IEEE 802.11-2012 19.4.5) */

		short_slot = true;

		goto out;

	} else if (band != IEEE80211_BAND_2GHZ ||

		   (band == IEEE80211_BAND_2GHZ &&

		    local->hw.flags & IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE))

	} else if (band != IEEE80211_BAND_2GHZ)

		goto out;



	for (i = 0; i < sband->n_bitrates; i++)

net/mac80211/mlme.c

+2 −4
Original line number Diff line number Diff line
@@ -669,9 +669,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata) 
	capab = WLAN_CAPABILITY_ESS;



	if (sband->band == IEEE80211_BAND_2GHZ) {

		if (!(local->hw.flags & IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE))

		capab |= WLAN_CAPABILITY_SHORT_SLOT_TIME;

		if (!(local->hw.flags & IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE))

		capab |= WLAN_CAPABILITY_SHORT_PREAMBLE;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE