Commit 6c5cd9d5 authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville
Browse files

iwlwifi: remove duplicate defines 



RX_FREE_BUFFERS and RX_LOW_WATERMARK are currently defined in four places.
Based on how files are included we only need the definition in iwl-fh.h

Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Reported-by: default avatarFrans Pop <elendil@planet.nl>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4a56e965

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

+0 −6
Original line number Diff line number Diff line
@@ -248,12 +248,6 @@ struct iwl3945_eeprom { 
#define TFD_CTL_PAD_SET(n)         (n << 28)

#define TFD_CTL_PAD_GET(ctl)       (ctl >> 28)



/*

 * RX related structures and functions

 */

#define RX_FREE_BUFFERS 64

#define RX_LOW_WATERMARK 8



/* Sizes and addresses for instruction and data memory (SRAM) in

 * 3945's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */

#define IWL39_RTC_INST_LOWER_BOUND		(0x000000)

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

+0 −6
Original line number Diff line number Diff line
@@ -130,12 +130,6 @@ struct iwl3945_frame { 
#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)

#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)



/*

 * RX related structures and functions

 */

#define RX_FREE_BUFFERS 64

#define RX_LOW_WATERMARK 8



#define SUP_RATE_11A_MAX_NUM_CHANNELS  8

#define SUP_RATE_11B_MAX_NUM_CHANNELS  4

#define SUP_RATE_11G_MAX_NUM_CHANNELS  12

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

+0 −6
Original line number Diff line number Diff line
@@ -407,12 +407,6 @@ struct iwl_host_cmd { 
	u8 id;

};



/*

 * RX related structures and functions

 */

#define RX_FREE_BUFFERS 64

#define RX_LOW_WATERMARK 8



#define SUP_RATE_11A_MAX_NUM_CHANNELS  8

#define SUP_RATE_11B_MAX_NUM_CHANNELS  4

#define SUP_RATE_11G_MAX_NUM_CHANNELS  12