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

Commit 4f85f5b3 authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

iwlwifi: removing IWL4965_HT config 



This patch removes CONFIG_IWL4965_HT #ifdefs for iwl 4965 and 5000. 11n
feature is stable in those drivers and its mode of operation is determined
in mac80211, so this dependency is not needed any more.

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a19d7292

drivers/net/wireless/iwlwifi/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -54,14 +54,6 @@ config IWL4965 
	  say M here and read <file:Documentation/kbuild/modules.txt>.  The

	  module will be called iwl4965.ko.



config IWL4965_HT

	bool "Enable 802.11n HT features in iwl4965 driver"

	depends on EXPERIMENTAL

	depends on IWL4965

	---help---

	  This option enables IEEE 802.11n High Throughput features

	  for the iwl4965 driver.



config IWL4965_LEDS

	bool "Enable LEDS features in iwl4965 driver"

	depends on IWL4965

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

+1 −45
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ struct iwl4965_scale_tbl_info { 
	struct iwl4965_rate_scale_data win[IWL_RATE_COUNT]; /* rate histories */

};



#ifdef CONFIG_IWL4965_HT



struct iwl4965_traffic_load {

	unsigned long time_stamp;	/* age of the oldest statistics */

	u32 packet_count[TID_QUEUE_MAX_SIZE];   /* packet count in this time
@@ -118,8 +116,6 @@ struct iwl4965_traffic_load { 
	u8 head;			/* start of the circular buffer */

};



#endif /* CONFIG_IWL4965_HT */



/**

 * struct iwl4965_lq_sta -- driver's rate scaling private structure

 *
@@ -157,16 +153,12 @@ struct iwl4965_lq_sta { 


	struct iwl_link_quality_cmd lq;

	struct iwl4965_scale_tbl_info lq_info[LQ_SIZE]; /* "active", "search" */

#ifdef CONFIG_IWL4965_HT

	struct iwl4965_traffic_load load[TID_MAX_LOAD_COUNT];

	u8 tx_agg_tid_en;

#endif

#ifdef CONFIG_MAC80211_DEBUGFS

	struct dentry *rs_sta_dbgfs_scale_table_file;

	struct dentry *rs_sta_dbgfs_stats_table_file;

#ifdef CONFIG_IWL4965_HT

	struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;

#endif

	u32 dbg_fixed_rate;

#endif

	struct iwl_priv *drv;
@@ -256,7 +248,6 @@ static inline u8 rs_is_valid_ant(u8 valid_antenna, u8 ant_type) 
	return ((ant_type & valid_antenna) == ant_type);

}



#ifdef CONFIG_IWL4965_HT

/*

 *	removes the old data from the statistics. All data that is older than

 *	TID_MAX_TIME_DIFF, will be deleted.
@@ -389,8 +380,6 @@ static void rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid, 
			rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);

}



#endif /* CONFIG_IWLWIFI_HT */



static inline int get_num_of_ant_from_rate(u32 rate_n_flags)

{

	return (!!(rate_n_flags & RATE_MCS_ANT_A_MSK) +
@@ -626,7 +615,6 @@ static int rs_toggle_antenna(u32 valid_ant, u32 *rate_n_flags, 


/* FIXME:RS: in 4965 we don't use greenfield at all */

/* FIXME:RS: don't use greenfield for now in TX */

/* #ifdef CONFIG_IWL4965_HT */

#if 0

static inline u8 rs_use_green(struct iwl_priv *priv, struct ieee80211_conf *conf)

{
@@ -634,12 +622,11 @@ static inline u8 rs_use_green(struct iwl_priv *priv, struct ieee80211_conf *conf 
		priv->current_ht_config.is_green_field &&

		!priv->current_ht_config.non_GF_STA_present);

}

#else

#endif

static inline u8 rs_use_green(struct iwl_priv *priv, struct ieee80211_conf *conf)

{

	return 0;

}

#endif	/* CONFIG_IWL4965_HT */



/**

 * rs_get_supported_rates - get the available rates
@@ -1050,7 +1037,6 @@ static void rs_set_expected_tpt_table(struct iwl4965_lq_sta *lq_sta, 
		tbl->expected_tpt = expected_tpt_G;

}



#ifdef CONFIG_IWL4965_HT

/*

 * Find starting rate for new "search" high-throughput mode of modulation.

 * Goal is to find lowest expected rate (under perfect conditions) that is
@@ -1152,12 +1138,10 @@ static s32 rs_get_best_rate(struct iwl_priv *priv, 


	return new_rate;

}

#endif				/* CONFIG_IWL4965_HT */



/*

 * Set up search table for MIMO

 */

#ifdef CONFIG_IWL4965_HT

static int rs_switch_to_mimo2(struct iwl_priv *priv,

			     struct iwl4965_lq_sta *lq_sta,

			     struct ieee80211_conf *conf,
@@ -1221,16 +1205,6 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv, 
		     tbl->current_rate, is_green);

	return 0;

}

#else

static int rs_switch_to_mimo2(struct iwl_priv *priv,

			     struct iwl4965_lq_sta *lq_sta,

			     struct ieee80211_conf *conf,

			     struct sta_info *sta,

			     struct iwl4965_scale_tbl_info *tbl, int index)

{

	return -1;

}

#endif	/*CONFIG_IWL4965_HT */



/*

 * Set up search table for SISO
@@ -1241,7 +1215,6 @@ static int rs_switch_to_siso(struct iwl_priv *priv, 
			     struct sta_info *sta,

			     struct iwl4965_scale_tbl_info *tbl, int index)

{

#ifdef CONFIG_IWL4965_HT

	u16 rate_mask;

	u8 is_green = lq_sta->is_green;

	s32 rate;
@@ -1291,9 +1264,6 @@ static int rs_switch_to_siso(struct iwl_priv *priv, 
	IWL_DEBUG_RATE("LQ: Switch to new mcs %X index is green %X\n",

		     tbl->current_rate, is_green);

	return 0;

#else

	return -1;

#endif	/*CONFIG_IWL4965_HT */

}



/*
@@ -1689,9 +1659,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, 
	u8 done_search = 0;

	u16 high_low;

	s32 sr;

#ifdef CONFIG_IWL4965_HT

	u8 tid = MAX_TID_COUNT;

#endif



	IWL_DEBUG_RATE("rate scale calculate new rate for skb\n");
@@ -1712,9 +1680,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, 
	}

	lq_sta = (struct iwl4965_lq_sta *)sta->rate_ctrl_priv;



#ifdef CONFIG_IWL4965_HT

	rs_tl_add_packet(lq_sta, hdr);

#endif

	/*

	 * Select rate-scale / modulation-mode table to work with in

	 * the rest of this function:  "search" if searching for better
@@ -2013,9 +1979,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, 
		 * before next round of mode comparisons. */

		tbl1 = &(lq_sta->lq_info[lq_sta->active_tbl]);

		if (is_legacy(tbl1->lq_type) &&

#ifdef CONFIG_IWL4965_HT

		   (!(conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE)) &&

#endif

		    (lq_sta->action_counter >= 1)) {

			lq_sta->action_counter = 0;

			IWL_DEBUG_RATE("LQ: STAY in legacy table\n");
@@ -2027,14 +1991,12 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, 
		 * mode for a while before next round of mode comparisons. */

		if (lq_sta->enable_counter &&

		    (lq_sta->action_counter >= IWL_ACTION_LIMIT)) {

#ifdef CONFIG_IWL4965_HT

			if ((lq_sta->last_tpt > IWL_AGG_TPT_THREHOLD) &&

			    (lq_sta->tx_agg_tid_en & (1 << tid)) &&

			    (tid != MAX_TID_COUNT)) {

				IWL_DEBUG_RATE("try to aggregate tid %d\n", tid);

				rs_tl_turn_on_agg(priv, tid, lq_sta, sta);

			}

#endif /*CONFIG_IWL4965_HT */

			lq_sta->action_counter = 0;

			rs_set_stay_in_table(priv, 0, lq_sta);

		}
@@ -2279,7 +2241,6 @@ static void rs_rate_init(void *priv_rate, void *priv_sta, 
	lq_sta->active_legacy_rate = priv->active_rate & ~(0x1000);

	lq_sta->active_rate_basic = priv->active_rate_basic;

	lq_sta->band = priv->band;

#ifdef CONFIG_IWL4965_HT

	/*

	 * active_siso_rate mask includes 9 MBits (bit 5), and CCK (bits 0-3),

	 * supp_rates[] does not; shift to convert format, force 9 MBits off.
@@ -2317,7 +2278,6 @@ static void rs_rate_init(void *priv_rate, void *priv_sta, 


	/* as default allow aggregation for all tids */

	lq_sta->tx_agg_tid_en = IWL_AGG_ALL_TID;

#endif /*CONFIG_IWL4965_HT*/

#ifdef CONFIG_MAC80211_DEBUGFS

	lq_sta->drv = priv;

#endif
@@ -2635,11 +2595,9 @@ static void rs_add_debugfs(void *priv, void *priv_sta, 
	lq_sta->rs_sta_dbgfs_stats_table_file =

		debugfs_create_file("rate_stats_table", 0600, dir,

			lq_sta, &rs_sta_dbgfs_stats_table_ops);

#ifdef CONFIG_IWL4965_HT

	lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file =

		debugfs_create_u8("tx_agg_tid_enable", 0600, dir,

		&lq_sta->tx_agg_tid_en);

#endif



}
@@ -2648,9 +2606,7 @@ static void rs_remove_debugfs(void *priv, void *priv_sta) 
	struct iwl4965_lq_sta *lq_sta = priv_sta;

	debugfs_remove(lq_sta->rs_sta_dbgfs_scale_table_file);

	debugfs_remove(lq_sta->rs_sta_dbgfs_stats_table_file);

#ifdef CONFIG_IWL4965_HT

	debugfs_remove(lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file);

#endif

}

#endif

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

+21 −41
Original line number Diff line number Diff line
@@ -2819,7 +2819,6 @@ void iwl4965_rx_reply_rx(struct iwl_priv *priv, 
		break;



	case IEEE80211_FTYPE_CTL:

#ifdef CONFIG_IWL4965_HT

		switch (fc & IEEE80211_FCTL_STYPE) {

		case IEEE80211_STYPE_BACK_REQ:

			IWL_DEBUG_HT("IEEE80211_STYPE_BACK_REQ arrived\n");
@@ -2829,7 +2828,6 @@ void iwl4965_rx_reply_rx(struct iwl_priv *priv, 
		default:

			break;

		}

#endif

		break;



	case IEEE80211_FTYPE_DATA: {
@@ -2863,8 +2861,6 @@ void iwl4965_rx_reply_rx(struct iwl_priv *priv, 
	}

}



#ifdef CONFIG_IWL4965_HT



/**

 * iwl4965_tx_status_reply_compressed_ba - Update tx status from block-ack

 *
@@ -3154,10 +3150,6 @@ static int iwl4965_txq_agg_enable(struct iwl_priv *priv, int txq_id, 
	return 0;

}



#endif /* CONFIG_IWL4965_HT */





#ifdef CONFIG_IWL4965_HT

static int iwl4965_rx_agg_start(struct iwl_priv *priv,

				const u8 *addr, int tid, u16 ssn)

{
@@ -3231,8 +3223,6 @@ int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw, 
	}

	return 0;

}

#endif /* CONFIG_IWL4965_HT */





static u16 iwl4965_get_hcmd_size(u8 cmd_id, u16 len)

{
@@ -3262,7 +3252,6 @@ static u16 iwl4965_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data) 
	return (u16)sizeof(struct iwl4965_addsta_cmd);

}



#ifdef CONFIG_IWL4965_HT

static inline u32 iwl4965_get_scd_ssn(struct iwl4965_tx_resp *tx_resp)

{

	__le32 *scd_ssn = (__le32 *)((u32 *)&tx_resp->status +
@@ -3388,7 +3377,6 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv, 
	}

	return 0;

}

#endif



/**

 * iwl4965_rx_reply_tx - Handle standard (non-aggregation) Tx response
@@ -3404,12 +3392,10 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
	struct ieee80211_tx_info *info;

	struct iwl4965_tx_resp *tx_resp = (void *)&pkt->u.raw[0];

	u32  status = le32_to_cpu(tx_resp->status);

#ifdef CONFIG_IWL4965_HT

	int tid = MAX_TID_COUNT, sta_id = IWL_INVALID_STATION;

	u16 fc;

	struct ieee80211_hdr *hdr;

	u8 *qc = NULL;

#endif



	if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) {

		IWL_ERROR("Read index for DMA queue txq_id (%d) index %d "
@@ -3422,7 +3408,6 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
	info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb[0]);

	memset(&info->status, 0, sizeof(info->status));



#ifdef CONFIG_IWL4965_HT

	hdr = iwl_tx_queue_get_hdr(priv, txq_id, index);

	fc = le16_to_cpu(hdr->frame_control);

	if (ieee80211_is_qos_data(fc)) {
@@ -3474,20 +3459,20 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
			iwl_txq_check_empty(priv, sta_id, tid, txq_id);

		}

	} else {

#endif /* CONFIG_IWL4965_HT */



		info->status.retry_count = tx_resp->failure_frame;

	info->flags |= iwl_is_tx_success(status) ? IEEE80211_TX_STAT_ACK : 0;

	iwl4965_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags),

		info->flags |=

			iwl_is_tx_success(status) ? IEEE80211_TX_STAT_ACK : 0;

		iwl4965_hwrate_to_tx_control(priv,

					le32_to_cpu(tx_resp->rate_n_flags),

					info);



	IWL_DEBUG_TX("Tx queue %d Status %s (0x%08x) rate_n_flags 0x%x "

		     "retries %d\n", txq_id, iwl_get_tx_fail_reason(status),

		IWL_DEBUG_TX("Tx queue %d Status %s (0x%08x) rate_n_flags "

			     "0x%x retries %d\n", txq_id,

				iwl_get_tx_fail_reason(status),

				status, le32_to_cpu(tx_resp->rate_n_flags),

				tx_resp->failure_frame);



		IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index);

#ifdef CONFIG_IWL4965_HT

		if (index != -1) {

		    int freed = iwl_tx_queue_reclaim(priv, txq_id, index);

		    if (tid != MAX_TID_COUNT)
@@ -3499,7 +3484,6 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
			iwl_txq_check_empty(priv, sta_id, tid, txq_id);

		}

	}

#endif /* CONFIG_IWL4965_HT */



	if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))

		IWL_ERROR("TODO:  Implement Tx ABORT REQUIRED!!!\n");
@@ -3513,10 +3497,8 @@ static void iwl4965_rx_handler_setup(struct iwl_priv *priv) 
	priv->rx_handlers[REPLY_RX] = iwl4965_rx_reply_rx;

	/* Tx response */

	priv->rx_handlers[REPLY_TX] = iwl4965_rx_reply_tx;



#ifdef CONFIG_IWL4965_HT

	/* block ack */

	priv->rx_handlers[REPLY_COMPRESSED_BA] = iwl4965_rx_reply_compressed_ba;

#endif /* CONFIG_IWL4965_HT */

}



void iwl4965_hw_setup_deferred_work(struct iwl_priv *priv)
@@ -3558,10 +3540,8 @@ static struct iwl_lib_ops iwl4965_lib = { 
	.shared_mem_rx_idx = iwl4965_shared_mem_rx_idx,

	.txq_update_byte_cnt_tbl = iwl4965_txq_update_byte_cnt_tbl,

	.txq_set_sched = iwl4965_txq_set_sched,

#ifdef CONFIG_IWL4965_HT

	.txq_agg_enable = iwl4965_txq_agg_enable,

	.txq_agg_disable = iwl4965_txq_agg_disable,

#endif

	.rx_handler_setup = iwl4965_rx_handler_setup,

	.is_valid_rtc_data_addr = iwl4965_hw_valid_rtc_data_addr,

	.alive_notify = iwl4965_alive_notify,

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

+20 −24
Original line number Diff line number Diff line
@@ -1136,12 +1136,10 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, 
	struct ieee80211_tx_info *info;

	struct iwl5000_tx_resp *tx_resp = (void *)&pkt->u.raw[0];

	u32  status = le16_to_cpu(tx_resp->status.status);

#ifdef CONFIG_IWL4965_HT

	int tid = MAX_TID_COUNT, sta_id = IWL_INVALID_STATION;

	u16 fc;

	struct ieee80211_hdr *hdr;

	u8 *qc = NULL;

#endif



	if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) {

		IWL_ERROR("Read index for DMA queue txq_id (%d) index %d "
@@ -1154,7 +1152,6 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, 
	info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb[0]);

	memset(&info->status, 0, sizeof(info->status));



#ifdef CONFIG_IWL4965_HT

	hdr = iwl_tx_queue_get_hdr(priv, txq_id, index);

	fc = le16_to_cpu(hdr->frame_control);

	if (ieee80211_is_qos_data(fc)) {
@@ -1205,20 +1202,20 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, 
			iwl_txq_check_empty(priv, sta_id, tid, txq_id);

		}

	} else {

#endif /* CONFIG_IWL4965_HT */



		info->status.retry_count = tx_resp->failure_frame;

	info->flags = iwl_is_tx_success(status) ? IEEE80211_TX_STAT_ACK : 0;

	iwl4965_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags),

		info->flags =

			iwl_is_tx_success(status) ? IEEE80211_TX_STAT_ACK : 0;

		iwl4965_hwrate_to_tx_control(priv,

					le32_to_cpu(tx_resp->rate_n_flags),

					info);



	IWL_DEBUG_TX("Tx queue %d Status %s (0x%08x) rate_n_flags 0x%x "

		     "retries %d\n", txq_id, iwl_get_tx_fail_reason(status),

		IWL_DEBUG_TX("Tx queue %d Status %s (0x%08x) rate_n_flags "

			     "0x%x retries %d\n", txq_id,

				iwl_get_tx_fail_reason(status),

				status, le32_to_cpu(tx_resp->rate_n_flags),

				tx_resp->failure_frame);



		IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index);

#ifdef CONFIG_IWL4965_HT

		if (index != -1) {

		    int freed = iwl_tx_queue_reclaim(priv, txq_id, index);

		    if (tid != MAX_TID_COUNT)
@@ -1230,7 +1227,6 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, 
			iwl_txq_check_empty(priv, sta_id, tid, txq_id);

		}

	}

#endif /* CONFIG_IWL4965_HT */



	if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))

		IWL_ERROR("TODO:  Implement Tx ABORT REQUIRED!!!\n");

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

+0 −18
Original line number Diff line number Diff line
@@ -321,7 +321,6 @@ void iwl_reset_qos(struct iwl_priv *priv) 
}

EXPORT_SYMBOL(iwl_reset_qos);



#ifdef CONFIG_IWL4965_HT

#define MAX_BIT_RATE_40_MHZ 0x96; /* 150 Mbps */

#define MAX_BIT_RATE_20_MHZ 0x48; /* 72 Mbps */

static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv,
@@ -374,13 +373,6 @@ static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv, 
		ht_info->supp_mcs_set[12] |= ((tx_chains_num - 1) << 2);

	}

}

#else

static inline void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv,

			      struct ieee80211_ht_info *ht_info,

			      enum ieee80211_band band)

{

}

#endif /* CONFIG_IWL4965_HT */



static void iwlcore_init_hw_rates(struct iwl_priv *priv,

			      struct ieee80211_rate *rates)
@@ -553,7 +545,6 @@ static void iwlcore_free_geos(struct iwl_priv *priv) 
	clear_bit(STATUS_GEO_CONFIGURED, &priv->status);

}



#ifdef CONFIG_IWL4965_HT

static u8 is_single_rx_stream(struct iwl_priv *priv)

{

	return !priv->current_ht_config.is_ht ||
@@ -660,13 +651,6 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_info *ht_info) 
}

EXPORT_SYMBOL(iwl_set_rxon_ht);



#else

static inline u8 is_single_rx_stream(struct iwl_priv *priv)

{

	return 1;

}

#endif	/*CONFIG_IWL4965_HT */



/*

 * Determine how many receiver/antenna chains to use.

 * More provides better reception via diversity.  Fewer saves power.
@@ -791,10 +775,8 @@ int iwl_setup_mac(struct iwl_priv *priv) 
		    IEEE80211_HW_NOISE_DBM;

	/* Default value; 4 EDCA QOS priorities */

	hw->queues = 4;

#ifdef CONFIG_IWL4965_HT

	/* Enhanced value; more queues, to support 11n aggregation */

	hw->ampdu_queues = 12;

#endif /* CONFIG_IWL4965_HT */



	hw->conf.beacon_int = 100;