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

Commit dda61a44 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: iwl-dev.h doesn't include iwl-fh.h any more 



Since iwl-fh.h contains transport related data, it shouldn't be included by the
upper layer.
Only the transport layer and iwl-agn-ucode.c includes it.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ab9e212e

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

+0 −13
Original line number Diff line number Diff line
@@ -95,17 +95,4 @@ 
#define IWLAGN_NUM_AMPDU_QUEUES		9

#define IWLAGN_FIRST_AMPDU_QUEUE	11



/* Fixed (non-configurable) rx data from phy */



/**

 * struct iwlagn_schedq_bc_tbl scheduler byte count table

 *	base physical address provided by SCD_DRAM_BASE_ADDR

 * @tfd_offset  0-12 - tx command byte count

 *	       12-16 - station index

 */

struct iwlagn_scd_bc_tbl {

	__le16 tfd_offset[TFD_QUEUE_BC_SIZE];

} __packed;





#endif /* __iwl_agn_hw_h__ */

drivers/net/wireless/iwlwifi/iwl-agn-ucode.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "iwl-agn.h"

#include "iwl-agn-calib.h"

#include "iwl-trans.h"

#include "iwl-fh.h"



static struct iwl_wimax_coex_event_entry cu_priorities[COEX_NUM_OF_EVENTS] = {

	{COEX_CU_UNASSOC_IDLE_RP, COEX_CU_UNASSOC_IDLE_WP,

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

+4 −0
Original line number Diff line number Diff line
@@ -3189,6 +3189,10 @@ static u32 iwl_hw_detect(struct iwl_priv *priv) 
	return iwl_read32(priv, CSR_HW_REV);

}



/* Size of one Rx buffer in host DRAM */

#define IWL_RX_BUF_SIZE_4K (4 * 1024)

#define IWL_RX_BUF_SIZE_8K (8 * 1024)



static int iwl_set_hw_params(struct iwl_priv *priv)

{

	if (iwlagn_mod_params.amsdu_size_8K)

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

+1 −0
Original line number Diff line number Diff line
@@ -3911,6 +3911,7 @@ struct iwlagn_wowlan_kek_kck_material_cmd { 
 * Union of all expected notifications/responses:

 *

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

#define FH_RSCSR_FRAME_SIZE_MSK	(0x00003FFF)	/* bits 0-13 */



struct iwl_rx_packet {

	/*

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

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include "iwl-eeprom.h"

#include "iwl-csr.h"

#include "iwl-prph.h"

#include "iwl-fh.h"

#include "iwl-debug.h"

#include "iwl-agn-hw.h"

#include "iwl-led.h"