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

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

iwlwifi: rename iwl-4695-rs to iwl-agn-rs 



This patch renames iwl-4965-rs to iwl-agn-rs as it provides
rate scale capability for all AGN capable iwlwifi drivers.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e2e3c57b

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o 
iwl3945-$(CONFIG_IWL3945_LEDS) += iwl-3945-led.o



obj-$(CONFIG_IWL4965)	+= iwl4965.o

iwl4965-objs		:= iwl4965-base.o iwl-4965.o iwl-4965-rs.o

iwl4965-objs		:= iwl4965-base.o iwl-4965.o iwl-agn-rs.o



ifeq ($(CONFIG_IWL5000),y)

	iwl4965-objs += iwl-5000.o

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

+105 −114

File changed and moved.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/iwlwifi/iwl-4965-rs.h→drivers/net/wireless/iwlwifi/iwl-agn-rs.h

+7 −7
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
 *

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



#ifndef __iwl_4965_rs_h__

#define __iwl_4965_rs_h__

#ifndef __iwl_agn_rs_h__

#define __iwl_agn_rs_h__



#include "iwl-dev.h"
@@ -88,7 +88,7 @@ enum { 
#define	IWL_RATE_5M_MASK   (1 << IWL_RATE_5M_INDEX)

#define	IWL_RATE_11M_MASK  (1 << IWL_RATE_11M_INDEX)



/* 4965 uCode API values for legacy bit rates, both OFDM and CCK */

/* uCode API values for legacy bit rates, both OFDM and CCK */

enum {

	IWL_RATE_6M_PLCP  = 13,

	IWL_RATE_9M_PLCP  = 15,
@@ -107,7 +107,7 @@ enum { 
	/*FIXME:RS:add IWL_RATE_LEGACY_INVM_PLCP = 0,*/

};



/* 4965 uCode API values for OFDM high-throughput (HT) bit rates */

/* uCode API values for OFDM high-throughput (HT) bit rates */

enum {

	IWL_RATE_SISO_6M_PLCP = 0,

	IWL_RATE_SISO_12M_PLCP = 1,
@@ -305,7 +305,7 @@ extern int iwl4965_fill_rs_info(struct ieee80211_hw *, char *buf, u8 sta_id); 
 * ieee80211_register_hw

 *

 */

extern int iwl4965_rate_control_register(void);

extern int iwlagn_rate_control_register(void);



/**

 * iwl4965_rate_control_unregister - Unregister the rate control callbacks
@@ -313,6 +313,6 @@ extern int iwl4965_rate_control_register(void); 
 * This should be called after calling ieee80211_unregister_hw, but before

 * the driver is unloaded.

 */

extern void iwl4965_rate_control_unregister(void);

extern void iwlagn_rate_control_unregister(void);



#endif
 
#endif /* __iwl_agn__rs__ */

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

+1 −1
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ int iwl_setup_mac(struct iwl_priv *priv) 
{

	int ret;

	struct ieee80211_hw *hw = priv->hw;

	hw->rate_control_algorithm = "iwl-4965-rs";

	hw->rate_control_algorithm = "iwl-agn-rs";



	/* Tell mac80211 our characteristics */

	hw->flags = IEEE80211_HW_SIGNAL_DBM |

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

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "iwl-debug.h"

#include "iwl-led.h"

#include "iwl-power.h"

#include "iwl-agn-rs.h"



/* configuration for the iwl4965 */

extern struct iwl_cfg iwl4965_agn_cfg;
@@ -191,7 +192,6 @@ struct iwl4965_clip_group { 
	const s8 clip_powers[IWL_MAX_RATES];

};



#include "iwl-4965-rs.h"



#define IWL_TX_FIFO_AC0	0

#define IWL_TX_FIFO_AC1	1