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

Commit 8ccde88a authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

iwl3945: Getting rid of the *39_rxon iwl_priv fields 



The iwl_rxon_cmd is really just a iwl3945_rxon_cmd structure extension.
So, we can use the *_rxon fields from iwl_priv instead of the 3945 specific
ones (*39_rxon). We have to then be careful when submitting REPLY_RXON host
commands, since the command length as to be set according to the HW. As
another precaution the reserved4 and reserved5 fields are cleared before being
sent to the 3945.

With the *39_rxon removal, a lot of duplicated code can be removed from the
3945 code base.

Signed-off-by: default avatarSamuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d14c7c1d

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ iwlcore-$(CONFIG_IWLWIFI_RFKILL) += iwl-rfkill.o 
iwlcore-$(CONFIG_IWLAGN_SPECTRUM_MEASUREMENT) += iwl-spectrum.o



obj-$(CONFIG_IWLAGN)	+= iwlagn.o

iwlagn-objs		:= iwl-agn.o iwl-agn-rs.o iwl-agn-hcmd-check.o

iwlagn-objs		:= iwl-agn.o iwl-agn-rs.o



iwlagn-$(CONFIG_IWL4965) += iwl-4965.o

iwlagn-$(CONFIG_IWL5000) += iwl-5000.o

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

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) 
	switch (priv->band) {

	case IEEE80211_BAND_2GHZ:

		/* TODO: this always does G, not a regression */

		if (priv->active39_rxon.flags & RXON_FLG_TGG_PROTECT_MSK) {

		if (priv->active_rxon.flags & RXON_FLG_TGG_PROTECT_MSK) {

			rs_sta->tgg = 1;

			rs_sta->expected_tpt = iwl3945_expected_tpt_g_prot;

		} else

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

+7 −6
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate) 
		break;

	case IEEE80211_BAND_2GHZ:

		if (!(priv->sta_supp_rates & IWL_OFDM_RATES_MASK) &&

		    iwl3945_is_associated(priv)) {

		    iwl_is_associated(priv)) {

			if (rate == IWL_RATE_11M_INDEX)

				next_rate = IWL_RATE_5M_INDEX;

		}
@@ -579,7 +579,8 @@ static void iwl3945_pass_packet_to_mac80211(struct iwl_priv *priv, 
	skb_put(rxb->skb, le16_to_cpu(rx_hdr->len));



	if (!iwl3945_mod_params.sw_crypto)

		iwl3945_set_decrypted_flag(priv, rxb->skb,

		iwl_set_decrypted_flag(priv,

				       (struct ieee80211_hdr *)rxb->skb->data,

				       le32_to_cpu(rx_end->status), stats);



#ifdef CONFIG_IWL3945_LEDS
@@ -1694,17 +1695,17 @@ int iwl3945_send_tx_power(struct iwl_priv *priv) 
	int rate_idx, i;

	const struct iwl_channel_info *ch_info = NULL;

	struct iwl3945_txpowertable_cmd txpower = {

		.channel = priv->active39_rxon.channel,

		.channel = priv->active_rxon.channel,

	};



	txpower.band = (priv->band == IEEE80211_BAND_5GHZ) ? 0 : 1;

	ch_info = iwl_get_channel_info(priv,

				       priv->band,

				       le16_to_cpu(priv->active39_rxon.channel));

				       le16_to_cpu(priv->active_rxon.channel));

	if (!ch_info) {

		IWL_ERR(priv,

			"Failed to get channel info for channel %d [%d]\n",

			le16_to_cpu(priv->active39_rxon.channel), priv->band);

			le16_to_cpu(priv->active_rxon.channel), priv->band);

		return -EINVAL;

	}
@@ -2432,7 +2433,7 @@ int iwl3945_init_hw_rate_table(struct iwl_priv *priv) 
		 * 1M CCK rates */



		if (!(priv->sta_supp_rates & IWL_OFDM_RATES_MASK) &&

		    iwl3945_is_associated(priv)) {

		    iwl_is_associated(priv)) {



			index = IWL_FIRST_CCK_RATE;

			for (i = IWL_RATE_6M_INDEX_TABLE;

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

+0 −8
Original line number Diff line number Diff line
@@ -222,9 +222,6 @@ extern int __must_check iwl3945_send_cmd(struct iwl_priv *priv, 
					 struct iwl_host_cmd *cmd);

extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,

					struct ieee80211_hdr *hdr,int left);

extern void iwl3945_set_decrypted_flag(struct iwl_priv *priv, struct sk_buff *skb,

				   u32 decrypt_res,

				   struct ieee80211_rx_status *stats);



/*

 * Currently used by iwl-3945-rs... look at restructuring so that it doesn't
@@ -303,11 +300,6 @@ extern int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv); 
extern u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id,

		 u16 tx_rate, u8 flags);



static inline int iwl3945_is_associated(struct iwl_priv *priv)

{

	return (priv->active39_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;

}



extern const struct iwl_channel_info *iwl3945_get_channel_info(

	const struct iwl_priv *priv, enum ieee80211_band band, u16 channel);

drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c

deleted100644 → 0
+0 −109
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2009 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,

 * USA

 *

 * The full GNU General Public License is included in this distribution

 * in the file called LICENSE.GPL.

 *

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

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



#include <linux/kernel.h>

#include <net/mac80211.h>

#include "iwl-dev.h"

#include "iwl-debug.h"

#include "iwl-commands.h"





/**

 * iwl_check_rxon_cmd - validate RXON structure is valid

 *

 * NOTE:  This is really only useful during development and can eventually

 * be #ifdef'd out once the driver is stable and folks aren't actively

 * making changes

 */

int iwl_agn_check_rxon_cmd(struct iwl_priv *priv)

{

	int error = 0;

	int counter = 1;

	struct iwl_rxon_cmd *rxon = &priv->staging_rxon;



	if (rxon->flags & RXON_FLG_BAND_24G_MSK) {

		error |= le32_to_cpu(rxon->flags &

				(RXON_FLG_TGJ_NARROW_BAND_MSK |

				 RXON_FLG_RADAR_DETECT_MSK));

		if (error)

			IWL_WARN(priv, "check 24G fields %d | %d\n",

				    counter++, error);

	} else {

		error |= (rxon->flags & RXON_FLG_SHORT_SLOT_MSK) ?

				0 : le32_to_cpu(RXON_FLG_SHORT_SLOT_MSK);

		if (error)

			IWL_WARN(priv, "check 52 fields %d | %d\n",

				    counter++, error);

		error |= le32_to_cpu(rxon->flags & RXON_FLG_CCK_MSK);

		if (error)

			IWL_WARN(priv, "check 52 CCK %d | %d\n",

				    counter++, error);

	}

	error |= (rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1;

	if (error)

		IWL_WARN(priv, "check mac addr %d | %d\n", counter++, error);



	/* make sure basic rates 6Mbps and 1Mbps are supported */

	error |= (((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0) &&

		  ((rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0));

	if (error)

		IWL_WARN(priv, "check basic rate %d | %d\n", counter++, error);



	error |= (le16_to_cpu(rxon->assoc_id) > 2007);

	if (error)

		IWL_WARN(priv, "check assoc id %d | %d\n", counter++, error);



	error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))

			== (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK));

	if (error)

		IWL_WARN(priv, "check CCK and short slot %d | %d\n",

			    counter++, error);



	error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))

			== (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK));

	if (error)

		IWL_WARN(priv, "check CCK & auto detect %d | %d\n",

			    counter++, error);



	error |= ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |

			RXON_FLG_TGG_PROTECT_MSK)) == RXON_FLG_TGG_PROTECT_MSK);

	if (error)

		IWL_WARN(priv, "check TGG and auto detect %d | %d\n",

			    counter++, error);



	if (error)

		IWL_WARN(priv, "Tuning to channel %d\n",

			    le16_to_cpu(rxon->channel));



	if (error) {

		IWL_ERR(priv, "Not a valid iwl_rxon_assoc_cmd field values\n");

		return -1;

	}

	return 0;

}