Commit 78330fdd authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: Fix HT compilation breakage caused by cfg80211 API for channels/bitrates patch 



This patch fixes compilation breakage caused by 'cfg80211 API for
channels/bitrates' patch.
however it doesn't fix the driver's functional problems caused by that
patch.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b86af631

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

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static void rs_tx_status(void *priv_rate, 
	IWL_DEBUG_RATE("enter\n");



	retries = tx_resp->retry_count;



	/* FIXME : this is wrong */

	first_index = &sband->bitrates[0] - tx_resp->control.tx_rate;

	if ((first_index < 0) || (first_index >= IWL_RATE_COUNT)) {

		IWL_DEBUG_RATE("leave: Rate out of bounds: %d\n", first_index);

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

+7 −4
Original line number Diff line number Diff line
@@ -3459,14 +3459,15 @@ static int parse_elems(u8 *start, size_t len, struct ieee802_11_elems *elems) 
	return 0;

}



void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info, int mode)

void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info,

			      enum ieee80211_band band)

{

	ht_info->cap = 0;

	memset(ht_info->supp_mcs_set, 0, 16);



	ht_info->ht_supported = 1;



	if (mode == MODE_IEEE80211A) {

	if (band == IEEE80211_BAND_5GHZ) {

		ht_info->cap |= (u16)IEEE80211_HT_CAP_SUP_WIDTH;

		ht_info->cap |= (u16)IEEE80211_HT_CAP_SGI_40;

		ht_info->supp_mcs_set[4] = 0x01;
@@ -3896,7 +3897,9 @@ static int iwl4965_tx_status_reply_compressed_ba(struct iwl4965_priv *priv, 
	tx_status->flags |= IEEE80211_TX_STATUS_AMPDU;

	tx_status->ampdu_ack_map = successes;

	tx_status->ampdu_ack_len = agg->frame_count;

	/* FIXME Wrong rate

	tx_status->control.tx_rate = agg->rate_n_flags;

	*/



	IWL_DEBUG_TX_REPLY("Bitmap %llx\n", bitmap);
@@ -4252,7 +4255,7 @@ static u8 iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv, 
			return 0;

	}



	return (iwl4965_is_channel_extension(priv, priv->phymode,

	return (iwl4965_is_channel_extension(priv, priv->band,

					 iwl_ht_conf->control_channel,

					 iwl_ht_conf->extension_chan_offset));

}

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

+11 −7
Original line number Diff line number Diff line
@@ -772,17 +772,21 @@ extern int iwl4965_set_fat_chan_info(struct iwl4965_priv *priv, 
extern void iwl4965_rf_kill_ct_config(struct iwl4965_priv *priv);



#ifdef CONFIG_IWL4965_HT

extern void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info,

					int mode);

extern void iwl4965_set_rxon_ht(struct iwl4965_priv *priv,

void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info,

			      enum ieee80211_band band);

void iwl4965_set_rxon_ht(struct iwl4965_priv *priv,

			 struct iwl_ht_info *ht_info);

extern void iwl4965_set_ht_add_station(struct iwl4965_priv *priv, u8 index,

void iwl4965_set_ht_add_station(struct iwl4965_priv *priv, u8 index,

				struct ieee80211_ht_info *sta_ht_inf);

extern int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,

int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,

				    enum ieee80211_ampdu_mlme_action action,

				    const u8 *addr, u16 tid, u16 *ssn);

extern int iwl4965_check_empty_hw_queue(struct iwl4965_priv *priv, int sta_id,

int iwl4965_check_empty_hw_queue(struct iwl4965_priv *priv, int sta_id,

					u8 tid, int txq_id);

#else

static inline void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info,

					    enum ieee80211_band band) {}



#endif /*CONFIG_IWL4965_HT */

/* Structures, enum, and defines specific to the 4965 */

drivers/net/wireless/iwlwifi/iwl4965-base.c

+31 −52
Original line number Diff line number Diff line
@@ -1893,16 +1893,11 @@ static u16 iwl4965_supported_rate_to_ie(u8 *ie, u16 supported_rate, 
	return ret_rates;

}



#ifdef CONFIG_IWL4965_HT

void static iwl4965_set_ht_capab(struct ieee80211_hw *hw,

			     struct ieee80211_ht_cap *ht_cap,

			     u8 use_current_config);

#endif



/**

 * iwl4965_fill_probe_req - fill in all required fields and IE for probe request

 */

static u16 iwl4965_fill_probe_req(struct iwl4965_priv *priv,

				  enum ieee80211_band band,

				  struct ieee80211_mgmt *frame,

				  int left, int is_direct)

{
@@ -1910,7 +1905,8 @@ static u16 iwl4965_fill_probe_req(struct iwl4965_priv *priv, 
	u8 *pos = NULL;

	u16 active_rates, ret_rates, cck_rates, active_rate_basic;

#ifdef CONFIG_IWL4965_HT

	struct ieee80211_hw_mode *mode;

	const struct ieee80211_supported_band *sband =

						iwl4965_get_hw_mode(priv, band);

#endif /* CONFIG_IWL4965_HT */



	/* Make sure there is enough space for the probe request,
@@ -1995,13 +1991,18 @@ static u16 iwl4965_fill_probe_req(struct iwl4965_priv *priv, 
		len += 2 + *pos;



#ifdef CONFIG_IWL4965_HT

	mode = priv->hw->conf.mode;

	if (mode->ht_info.ht_supported) {

	if (sband && sband->ht_info.ht_supported) {

		struct ieee80211_ht_cap *ht_cap;

		pos += (*pos) + 1;

		*pos++ = WLAN_EID_HT_CAPABILITY;

		*pos++ = sizeof(struct ieee80211_ht_cap);

		iwl4965_set_ht_capab(priv->hw,

				(struct ieee80211_ht_cap *)pos, 0);

		ht_cap = (struct ieee80211_ht_cap *)pos;

		ht_cap->cap_info = cpu_to_le16(sband->ht_info.cap);

		memcpy(ht_cap->supp_mcs_set, sband->ht_info.supp_mcs_set, 16);

		ht_cap->ampdu_params_info =(sband->ht_info.ampdu_factor &

					    IEEE80211_HT_CAP_AMPDU_FACTOR) |

					    ((sband->ht_info.ampdu_density << 2) &

					    IEEE80211_HT_CAP_AMPDU_DENSITY);

		len += 2 + sizeof(struct ieee80211_ht_cap);

	}

#endif  /*CONFIG_IWL4965_HT */
@@ -3592,8 +3593,9 @@ static int iwl4965_tx_status_reply_tx(struct iwl4965_priv *priv, 
		tx_status->control.flags &= ~IEEE80211_TXCTL_AMPDU;

		tx_status->flags = iwl4965_is_tx_success(status)?

			IEEE80211_TX_STATUS_ACK : 0;

		/* FIXME Wrong Rate

		tx_status->control.tx_rate =

				iwl4965_hw_get_rate_n_flags(tx_resp->rate_n_flags);

				iwl4965_hw_get_rate_n_flags(tx_resp->rate_n_flags); */

		/* FIXME: code repetition end */



		IWL_DEBUG_TX_REPLY("1 Frame 0x%x failure :%d\n",
@@ -5775,22 +5777,20 @@ static int iwl4965_init_geos(struct iwl4965_priv *priv) 
	}



	/* 5.2GHz channels start after the 2.4GHz channels */

#ifdef CONFIG_IWL4965_HT

	iwl4965_init_ht_hw_capab(&modes[A].ht_info, MODE_IEEE80211A);

#endif

#ifdef CONFIG_IWL4965_HT

	iwl4965_init_ht_hw_capab(&modes[G].ht_info, MODE_IEEE80211G);

#endif

	band = &priv->bands[IEEE80211_BAND_5GHZ];

	band->channels = &channels[ARRAY_SIZE(iwl4965_eeprom_band_1)];

	band->bitrates = &rates[4];

	band->n_bitrates = 8;	/* just OFDM */



	iwl4965_init_ht_hw_capab(&band->ht_info, IEEE80211_BAND_5GHZ);



	band = &priv->bands[IEEE80211_BAND_2GHZ];

	band->channels = channels;

	band->bitrates = rates;

	band->n_bitrates = 12;	/* OFDM & CCK */



	iwl4965_init_ht_hw_capab(&band->ht_info, IEEE80211_BAND_2GHZ);



	priv->ieee_channels = channels;

	priv->ieee_rates = rates;
@@ -6860,8 +6860,9 @@ static void iwl4965_bg_request_scan(struct work_struct *data) 
	int rc = 0;

	struct iwl4965_scan_cmd *scan;

	struct ieee80211_conf *conf = NULL;

	u8 direct_mask;

	u16 cmd_len;

	enum ieee80211_band band;

	u8 direct_mask;



	conf = ieee80211_get_hw_conf(priv->hw);
@@ -6970,18 +6971,10 @@ static void iwl4965_bg_request_scan(struct work_struct *data) 
	} else

		direct_mask = 0;



	/* We don't build a direct scan probe request; the uCode will do

	 * that based on the direct_mask added to each channel entry */

	scan->tx_cmd.len = cpu_to_le16(

		iwl4965_fill_probe_req(priv, (struct ieee80211_mgmt *)scan->data,

			IWL_MAX_SCAN_SIZE - sizeof(*scan), 0));

	scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;

	scan->tx_cmd.sta_id = priv->hw_setting.bcast_sta_id;

	scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;



	/* flags + rate selection */



	scan->tx_cmd.tx_flags |= cpu_to_le32(0x200);



	switch (priv->scan_bands) {

	case 2:
@@ -7007,6 +7000,13 @@ static void iwl4965_bg_request_scan(struct work_struct *data) 
		goto done;

	}



	/* We don't build a direct scan probe request; the uCode will do

	 * that based on the direct_mask added to each channel entry */

	cmd_len = iwl4965_fill_probe_req(priv, band,

					(struct ieee80211_mgmt *)scan->data,

					IWL_MAX_SCAN_SIZE - sizeof(*scan), 0);



	scan->tx_cmd.len = cpu_to_le16(cmd_len);

	/* select Rx chains */



	/* Force use of chains B and C (0x6) for scan Rx.
@@ -7468,10 +7468,10 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co 
	}



#ifdef CONFIG_IWL4965_HT

	/* if we are switching fron ht to 2.4 clear flags

	/* if we are switching from ht to 2.4 clear flags

	 * from any ht related info since 2.4 does not

	 * support ht */

	if ((le16_to_cpu(priv->staging_rxon.channel) != conf->channel)

	if ((le16_to_cpu(priv->staging_rxon.channel) != conf->channel->hw_value)

#ifdef IEEE80211_CONF_CHANNEL_SWITCH

	    && !(conf->flags & IEEE80211_CONF_CHANNEL_SWITCH)

#endif
@@ -8188,27 +8188,6 @@ static int iwl4965_mac_conf_ht(struct ieee80211_hw *hw, 
	return 0;

}



static void iwl4965_set_ht_capab(struct ieee80211_hw *hw,

			struct ieee80211_ht_cap *ht_cap,

			u8 use_current_config)

{

	struct ieee80211_conf *conf = &hw->conf;



	if (use_current_config) {

		ht_cap->cap_info = cpu_to_le16(conf->ht_conf.cap);

		memcpy(ht_cap->supp_mcs_set,

				conf->ht_conf.supp_mcs_set, 16);

	} else {

		ht_cap->cap_info = cpu_to_le16(mode->ht_info.cap);

		memcpy(ht_cap->supp_mcs_set,

				mode->ht_info.supp_mcs_set, 16);

	}

	ht_cap->ampdu_params_info =

		(mode->ht_info.ampdu_factor & IEEE80211_HT_CAP_AMPDU_FACTOR) |

		((mode->ht_info.ampdu_density << 2) &

					IEEE80211_HT_CAP_AMPDU_DENSITY);

}



#endif /*CONFIG_IWL4965_HT*/



/*****************************************************************************