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

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

iwlagn: clean up of transport layer 



Move a few declarations needed by the transport layer to iwl-shared.h
Move iwl_cmd_meta, iwl_tx_queue and friends to the internal transport
header file.
Move iwl_device_cmd iwl_host_cmd and friends to iwl-trans.h since
these structs are used in the API to the transport layer.
Move get_cmd_string to the upper layer with a declaration in
iwl-shared.h.

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 3e10caeb

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

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
	else

		ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;



	iwl_print_rx_config_cmd(priv, ctx);

	iwl_print_rx_config_cmd(priv, ctx->ctxid);

	ret = iwl_check_rxon_cmd(priv, ctx);

	if (ret) {

		IWL_ERR(priv, "Invalid RXON configuration. Not committing.\n");

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

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ struct iwl_tt_mgmt { 
u8 iwl_tt_current_power_mode(struct iwl_priv *priv);

bool iwl_tt_is_low_power_state(struct iwl_priv *priv);

bool iwl_ht_enabled(struct iwl_priv *priv);

bool iwl_check_for_ct_kill(struct iwl_priv *priv);

enum iwl_antenna_ok iwl_tx_ant_restriction(struct iwl_priv *priv);

enum iwl_antenna_ok iwl_rx_ant_restriction(struct iwl_priv *priv);

void iwl_tt_enter_ct_kill(struct iwl_priv *priv);

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

+0 −2
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv, 
				 enum iwlagn_ucode_type ucode_type);



/* lib */

int iwlagn_hw_valid_rtc_data_addr(u32 addr);

int iwlagn_send_tx_power(struct iwl_priv *priv);

void iwlagn_temperature(struct iwl_priv *priv);

u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv);
@@ -109,7 +108,6 @@ int iwlagn_send_beacon_cmd(struct iwl_priv *priv); 
/* rx */

int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band);

void iwl_setup_rx_handlers(struct iwl_priv *priv);

void iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);





/* tx */

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

+2 −2
Original line number Diff line number Diff line
@@ -817,9 +817,9 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success) 
}



#ifdef CONFIG_IWLWIFI_DEBUG

void iwl_print_rx_config_cmd(struct iwl_priv *priv,

			     struct iwl_rxon_context *ctx)

void iwl_print_rx_config_cmd(struct iwl_priv *priv, u8 ctxid)

{

	struct iwl_rxon_context *ctx = &priv->contexts[ctxid];

	struct iwl_rxon_cmd *rxon = &ctx->staging;



	IWL_DEBUG_RADIO(priv, "RX CONFIG:\n");

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

+0 −22
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ struct iwl_cmd; 


#define TIME_UNIT		1024



#define IWL_CMD(x) case x: return #x



struct iwl_lib_ops {

	/* set hw dependent parameters */

	int (*set_hw_params)(struct iwl_priv *priv);
@@ -271,7 +269,6 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, 
#ifdef CONFIG_IWLWIFI_DEBUGFS

int iwl_alloc_traffic_mem(struct iwl_priv *priv);

void iwl_free_traffic_mem(struct iwl_priv *priv);

void iwl_reset_traffic_log(struct iwl_priv *priv);

void iwl_dbg_log_tx_data_frame(struct iwl_priv *priv,

				u16 length, struct ieee80211_hdr *header);

void iwl_dbg_log_rx_data_frame(struct iwl_priv *priv,
@@ -360,26 +357,12 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv, 
 *   S e n d i n g     H o s t     C o m m a n d s   *

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



const char *get_cmd_string(u8 cmd);

void iwl_bg_watchdog(unsigned long data);

u32 iwl_usecs_to_beacons(struct iwl_priv *priv, u32 usec, u32 beacon_interval);

__le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base,

			   u32 addon, u32 beacon_interval);





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

*  Error Handling Debugging

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

#ifdef CONFIG_IWLWIFI_DEBUG

void iwl_print_rx_config_cmd(struct iwl_priv *priv,

			     struct iwl_rxon_context *ctx);

#else

static inline void iwl_print_rx_config_cmd(struct iwl_priv *priv,

					   struct iwl_rxon_context *ctx)

{

}

#endif



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

*  GEOS

******************************************************/
@@ -389,8 +372,6 @@ void iwl_free_geos(struct iwl_priv *priv); 
extern void iwl_send_bt_config(struct iwl_priv *priv);

extern int iwl_send_statistics_request(struct iwl_priv *priv,

				       u8 flags, bool clear);

void iwl_apm_stop(struct iwl_priv *priv);

int iwl_apm_init(struct iwl_priv *priv);



int iwl_send_rxon_timing(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
@@ -408,7 +389,4 @@ static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv) 


extern bool bt_siso_mode;





void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand);



#endif /* __iwl_core_h__ */