View | Details | Raw Unified | Return to bug 34982
Collapse All | Expand All

(-)/usr/src/linux/drivers/net/wireless/iwlwifi/iwl-agn.c (+7 lines)
Lines 228-233 Link Here
228
	}
228
	}
229
	if (new_assoc) {
229
	if (new_assoc) {
230
		priv->start_calib = 0;
230
		priv->start_calib = 0;
231
232
		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
233
231
		/* Apply the new configuration
234
		/* Apply the new configuration
232
		 * RXON assoc doesn't clear the station table in uCode,
235
		 * RXON assoc doesn't clear the station table in uCode,
233
		 */
236
		 */
Lines 3754-3759 Link Here
3754
		}
3757
		}
3755
		if (test_bit(STATUS_EXIT_PENDING, &priv->status))
3758
		if (test_bit(STATUS_EXIT_PENDING, &priv->status))
3756
			ret = 0;
3759
			ret = 0;
3760
#if 0
3757
		if (priv->cfg->ht_params &&
3761
		if (priv->cfg->ht_params &&
3758
		    priv->cfg->ht_params->use_rts_for_aggregation) {
3762
		    priv->cfg->ht_params->use_rts_for_aggregation) {
3759
			struct iwl_station_priv *sta_priv =
3763
			struct iwl_station_priv *sta_priv =
Lines 3768-3774 Link Here
3768
					&sta_priv->lq_sta.lq, CMD_ASYNC, false);
3772
					&sta_priv->lq_sta.lq, CMD_ASYNC, false);
3769
		}
3773
		}
3770
		break;
3774
		break;
3775
#endif
3771
	case IEEE80211_AMPDU_TX_OPERATIONAL:
3776
	case IEEE80211_AMPDU_TX_OPERATIONAL:
3777
#if 0
3772
		if (priv->cfg->ht_params &&
3778
		if (priv->cfg->ht_params &&
3773
		    priv->cfg->ht_params->use_rts_for_aggregation) {
3779
		    priv->cfg->ht_params->use_rts_for_aggregation) {
3774
			struct iwl_station_priv *sta_priv =
3780
			struct iwl_station_priv *sta_priv =
Lines 3784-3789 Link Here
3784
			iwl_send_lq_cmd(priv, iwl_rxon_ctx_from_vif(vif),
3790
			iwl_send_lq_cmd(priv, iwl_rxon_ctx_from_vif(vif),
3785
					&sta_priv->lq_sta.lq, CMD_ASYNC, false);
3791
					&sta_priv->lq_sta.lq, CMD_ASYNC, false);
3786
		}
3792
		}
3793
#endif
3787
		ret = 0;
3794
		ret = 0;
3788
		break;
3795
		break;
3789
	}
3796
	}
(-)/usr/src/linux/drivers/net/wireless/iwlwifi/iwl-core.c (-4 lines)
Lines 1683-1692 Link Here
1683
			ctx->staging.flags |= RXON_FLG_TGG_PROTECT_MSK;
1683
			ctx->staging.flags |= RXON_FLG_TGG_PROTECT_MSK;
1684
		else
1684
		else
1685
			ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
1685
			ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
1686
		if (bss_conf->use_cts_prot)
1687
			ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
1688
		else
1689
			ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;
1690
	}
1686
	}
1691
1687
1692
	if (changes & BSS_CHANGED_BASIC_RATES) {
1688
	if (changes & BSS_CHANGED_BASIC_RATES) {

Return to bug 34982