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

Commit 94597ab2 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: fix rts cts protection 



Currently the driver will try to protect all frames,
which leads to a lot of odd things like sending an
RTS with a zeroed RA before multicast frames, which
is clearly bogus.

In order to fix all of this, we need to take a step
back and see what we need to achieve:
 * we need RTS/CTS protection if requested by
   the AP for the BSS, mac80211 tells us this
 * in that case, CTS-to-self should only be
   enabled when mac80211 tells us
 * additionally, as a hardware workaround, on
   some devices we have to protect aggregated
   frames with RTS

To achieve the first two items, set up the RXON
accordingly and set the protection required flag
in the transmit command when mac80211 requests
protection for the frame.

To achieve the last item, set the rate-control
RTS-requested flag for all stations that we have
aggregation sessions with, and set the protection
required flag when sending aggregated frames (on
those devices where this is required).

Since otherwise bugs can occur, do not allow the
user to override the RTS-for-aggregation setting
from sysfs any more.

Finally, also clean up the way all these flags get
set in the driver and move everything into the
device-specific functions.

Cc: stable@kernel.org [2.6.35]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fe100acd

drivers/net/wireless/iwlwifi/iwl-1000.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.shadow_ram_support = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

drivers/net/wireless/iwlwifi/iwl-3945.c

+1 −17
Original line number Diff line number Diff line
@@ -769,22 +769,6 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv, 
		rts_retry_limit = data_retry_limit;

	tx_cmd->rts_retry_limit = rts_retry_limit;



	if (ieee80211_is_mgmt(fc)) {

		switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {

		case cpu_to_le16(IEEE80211_STYPE_AUTH):

		case cpu_to_le16(IEEE80211_STYPE_DEAUTH):

		case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):

		case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):

			if (tx_flags & TX_CMD_FLG_RTS_MSK) {

				tx_flags &= ~TX_CMD_FLG_RTS_MSK;

				tx_flags |= TX_CMD_FLG_CTS_MSK;

			}

			break;

		default:

			break;

		}

	}



	tx_cmd->rate = rate;

	tx_cmd->tx_flags = tx_flags;
@@ -2717,7 +2701,7 @@ static struct iwl_lib_ops iwl3945_lib = { 
static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {

	.get_hcmd_size = iwl3945_get_hcmd_size,

	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,

	.rts_tx_cmd_flag = iwlcore_rts_tx_cmd_flag,

	.tx_cmd_protection = iwlcore_tx_cmd_protection,

	.request_scan = iwl3945_request_scan,

};

drivers/net/wireless/iwlwifi/iwl-4965.c

+1 −1
Original line number Diff line number Diff line
@@ -2223,7 +2223,7 @@ static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = { 
	.build_addsta_hcmd = iwl4965_build_addsta_hcmd,

	.chain_noise_reset = iwl4965_chain_noise_reset,

	.gain_computation = iwl4965_gain_computation,

	.rts_tx_cmd_flag = iwlcore_rts_tx_cmd_flag,

	.tx_cmd_protection = iwlcore_tx_cmd_protection,

	.calc_rssi = iwl4965_calc_rssi,

	.request_scan = iwlagn_request_scan,

};

drivers/net/wireless/iwlwifi/iwl-5000.c

+5 −5
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,
@@ -537,7 +537,7 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,
@@ -597,7 +597,7 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,
@@ -628,7 +628,7 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,
@@ -659,7 +659,7 @@ struct iwl_cfg iwl5150_agn_cfg = { 
	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

drivers/net/wireless/iwlwifi/iwl-6000.c

+8 −8
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = { 
	.shadow_ram_support = true,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.supports_idle = true,

	.adv_thermal_throttle = true,
@@ -489,7 +489,7 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = { 
	.shadow_ram_support = true,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.supports_idle = true,

	.adv_thermal_throttle = true,
@@ -563,7 +563,7 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = { 
	.shadow_ram_support = true,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.supports_idle = true,

	.adv_thermal_throttle = true,
@@ -637,7 +637,7 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = { 
	.shadow_ram_support = true,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.supports_idle = true,

	.adv_thermal_throttle = true,
@@ -714,7 +714,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = { 
	.shadow_ram_support = true,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.supports_idle = true,

	.adv_thermal_throttle = true,
@@ -821,7 +821,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.shadow_ram_support = true,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.supports_idle = true,

	.adv_thermal_throttle = true,
@@ -859,7 +859,7 @@ struct iwl_cfg iwl6050g2_bgn_cfg = { 
	.shadow_ram_support = true,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.supports_idle = true,

	.adv_thermal_throttle = true,
@@ -933,7 +933,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.shadow_ram_support = true,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.supports_idle = true,

	.adv_thermal_throttle = true,