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

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

iwlagn: iwl-pci doesn't include iwl-dev any more 



Move all the iwlXXX_abgn_cfg forward declaration to a separate file
so that iwl-pci.c doesn't need to include iwl-agn.h that includes
all iwl-dev.h
This allows to provide real encapsulation. Dereferencing iwl_priv
in the bus layer will now lead to a compilation error.

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 f090fba3

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

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

#include "iwl-agn-hw.h"

#include "iwl-shared.h"

#include "iwl-pci.h"



/* Highest firmware API version supported */

#define IWL1000_UCODE_API_MAX 6

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

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

#include "iwl-6000-hw.h"

#include "iwl-shared.h"

#include "iwl-pci.h"



/* Highest firmware API version supported */

#define IWL2030_UCODE_API_MAX 6

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "iwl-5000-hw.h"

#include "iwl-trans.h"

#include "iwl-shared.h"

#include "iwl-pci.h"



/* Highest firmware API version supported */

#define IWL5000_UCODE_API_MAX 5

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

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "iwl-6000-hw.h"

#include "iwl-trans.h"

#include "iwl-shared.h"

#include "iwl-pci.h"



/* Highest firmware API version supported */

#define IWL6000_UCODE_API_MAX 4

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

+0 −44
Original line number Diff line number Diff line
@@ -65,50 +65,6 @@ 


#include "iwl-dev.h"



/* configuration for the _agn devices */

extern struct iwl_cfg iwl5300_agn_cfg;

extern struct iwl_cfg iwl5100_agn_cfg;

extern struct iwl_cfg iwl5350_agn_cfg;

extern struct iwl_cfg iwl5100_bgn_cfg;

extern struct iwl_cfg iwl5100_abg_cfg;

extern struct iwl_cfg iwl5150_agn_cfg;

extern struct iwl_cfg iwl5150_abg_cfg;

extern struct iwl_cfg iwl6005_2agn_cfg;

extern struct iwl_cfg iwl6005_2abg_cfg;

extern struct iwl_cfg iwl6005_2bg_cfg;

extern struct iwl_cfg iwl6005_2agn_sff_cfg;

extern struct iwl_cfg iwl1030_bgn_cfg;

extern struct iwl_cfg iwl1030_bg_cfg;

extern struct iwl_cfg iwl6030_2agn_cfg;

extern struct iwl_cfg iwl6030_2abg_cfg;

extern struct iwl_cfg iwl6030_2bgn_cfg;

extern struct iwl_cfg iwl6030_2bg_cfg;

extern struct iwl_cfg iwl6000i_2agn_cfg;

extern struct iwl_cfg iwl6000i_2abg_cfg;

extern struct iwl_cfg iwl6000i_2bg_cfg;

extern struct iwl_cfg iwl6000_3agn_cfg;

extern struct iwl_cfg iwl6050_2agn_cfg;

extern struct iwl_cfg iwl6050_2abg_cfg;

extern struct iwl_cfg iwl6150_bgn_cfg;

extern struct iwl_cfg iwl6150_bg_cfg;

extern struct iwl_cfg iwl1000_bgn_cfg;

extern struct iwl_cfg iwl1000_bg_cfg;

extern struct iwl_cfg iwl100_bgn_cfg;

extern struct iwl_cfg iwl100_bg_cfg;

extern struct iwl_cfg iwl130_bgn_cfg;

extern struct iwl_cfg iwl130_bg_cfg;

extern struct iwl_cfg iwl2000_2bgn_cfg;

extern struct iwl_cfg iwl2000_2bg_cfg;

extern struct iwl_cfg iwl2030_2bgn_cfg;

extern struct iwl_cfg iwl2030_2bg_cfg;

extern struct iwl_cfg iwl6035_2agn_cfg;

extern struct iwl_cfg iwl6035_2abg_cfg;

extern struct iwl_cfg iwl6035_2bg_cfg;

extern struct iwl_cfg iwl105_bg_cfg;

extern struct iwl_cfg iwl105_bgn_cfg;

extern struct iwl_cfg iwl135_bg_cfg;

extern struct iwl_cfg iwl135_bgn_cfg;



extern struct ieee80211_ops iwlagn_hw_ops;



int iwl_reset_ict(struct iwl_trans *trans);