GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-27 17:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Emmanuel Grumbach 2011-08-25 23:11:11 -07:00 • committed by John W. Linville
parent ab9e212e92
commit dda61a4482
8 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/net/wireless/iwlwifi/iwl-agn-hw.h
View file

@ -95,17 +95,4 @@
#define IWLAGN_NUM_AMPDU_QUEUES 9 #define IWLAGN_NUM_AMPDU_QUEUES 9
#define IWLAGN_FIRST_AMPDU_QUEUE 11 #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__ */ #endif /* __iwl_agn_hw_h__ */

1
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
View file

@ -40,6 +40,7 @@
#include "iwl-agn.h" #include "iwl-agn.h"
#include "iwl-agn-calib.h" #include "iwl-agn-calib.h"
#include "iwl-trans.h" #include "iwl-trans.h"
#include "iwl-fh.h"
static struct iwl_wimax_coex_event_entry cu_priorities[COEX_NUM_OF_EVENTS] = { static struct iwl_wimax_coex_event_entry cu_priorities[COEX_NUM_OF_EVENTS] = {
{COEX_CU_UNASSOC_IDLE_RP, COEX_CU_UNASSOC_IDLE_WP, {COEX_CU_UNASSOC_IDLE_RP, COEX_CU_UNASSOC_IDLE_WP,

4
drivers/net/wireless/iwlwifi/iwl-agn.c
View file

@ -3189,6 +3189,10 @@ static u32 iwl_hw_detect(struct iwl_priv *priv)
return iwl_read32(priv, CSR_HW_REV); 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) static int iwl_set_hw_params(struct iwl_priv *priv)
{ {
if (iwlagn_mod_params.amsdu_size_8K) if (iwlagn_mod_params.amsdu_size_8K)

1
drivers/net/wireless/iwlwifi/iwl-commands.h
View file

@ -3911,6 +3911,7 @@ struct iwlagn_wowlan_kek_kck_material_cmd {
* Union of all expected notifications/responses: * Union of all expected notifications/responses:
* *
*****************************************************************************/ *****************************************************************************/
#define FH_RSCSR_FRAME_SIZE_MSK (0x00003FFF) /* bits 0-13 */
struct iwl_rx_packet { struct iwl_rx_packet {
/* /*

1
drivers/net/wireless/iwlwifi/iwl-dev.h
View file

@ -41,7 +41,6 @@
#include "iwl-eeprom.h" #include "iwl-eeprom.h"
#include "iwl-csr.h" #include "iwl-csr.h"
#include "iwl-prph.h" #include "iwl-prph.h"
#include "iwl-fh.h"
#include "iwl-debug.h" #include "iwl-debug.h"
#include "iwl-agn-hw.h" #include "iwl-agn-hw.h"
#include "iwl-led.h" #include "iwl-led.h"

18
drivers/net/wireless/iwlwifi/iwl-fh.h
View file

@ -266,8 +266,6 @@
#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_NO_INT_VAL (0x00000000) #define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_NO_INT_VAL (0x00000000)
#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL (0x00001000) #define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL (0x00001000)
#define FH_RSCSR_FRAME_SIZE_MSK (0x00003FFF) /* bits 0-13 */
/** /**
* Rx Shared Status Registers (RSSR) * Rx Shared Status Registers (RSSR)
* *
@ -422,10 +420,6 @@
#define RX_FREE_BUFFERS 64 #define RX_FREE_BUFFERS 64
#define RX_LOW_WATERMARK 8 #define RX_LOW_WATERMARK 8
/* Size of one Rx buffer in host DRAM */
#define IWL_RX_BUF_SIZE_4K (4 * 1024)
#define IWL_RX_BUF_SIZE_8K (8 * 1024)
/** /**
* struct iwl_rb_status - reseve buffer status * struct iwl_rb_status - reseve buffer status
* host memory mapped FH registers * host memory mapped FH registers
@ -508,4 +502,16 @@ struct iwl_tfd {
/* Keep Warm Size */ /* Keep Warm Size */
#define IWL_KW_SIZE 0x1000 /* 4k */ #define IWL_KW_SIZE 0x1000 /* 4k */
/* 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_fh_h__ */ #endif /* !__iwl_fh_h__ */

1
drivers/net/wireless/iwlwifi/iwl-sv-open.c
View file

@ -72,7 +72,6 @@
#include "iwl-dev.h" #include "iwl-dev.h"
#include "iwl-core.h" #include "iwl-core.h"
#include "iwl-debug.h" #include "iwl-debug.h"
#include "iwl-fh.h"
#include "iwl-io.h" #include "iwl-io.h"
#include "iwl-agn.h" #include "iwl-agn.h"
#include "iwl-testmode.h" #include "iwl-testmode.h"

2
drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
View file

@ -29,6 +29,8 @@
#ifndef __iwl_trans_int_pcie_h__ #ifndef __iwl_trans_int_pcie_h__
#define __iwl_trans_int_pcie_h__ #define __iwl_trans_int_pcie_h__
#include "iwl-fh.h"
/*This file includes the declaration that are internal to the /*This file includes the declaration that are internal to the
* trans_pcie layer */ * trans_pcie layer */