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

Commit bcb9321c authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlwifi: virtualize op_mode's fw_error 



Export it as "nic_error" notification, the error handling will be in
the op_mode.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 7120d989

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

+1 −0
Original line number Diff line number Diff line
@@ -1390,6 +1390,7 @@ const struct iwl_op_mode_ops iwl_dvm_ops = { 
	.queue_not_full = iwl_wake_sw_queue,

	.hw_rf_kill = iwl_set_hw_rfkill_state,

	.free_skb = iwl_free_skb,

	.nic_error = iwl_nic_error,

};



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

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

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ int __must_check iwl_rx_dispatch(struct iwl_op_mode *op_mode, 
void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, u8 ac);

void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, u8 ac);

void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state);

void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, u8 ac);

void iwl_nic_error(struct iwl_op_mode *op_mode);



/* MAC80211 */

struct ieee80211_hw *iwl_alloc_all(void);

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

+8 −1
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ void iwl_print_rx_config_cmd(struct iwl_priv *priv, 
}

#endif



void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)

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

{

	unsigned int reload_msec;

	unsigned long reload_jiffies;
@@ -1455,6 +1455,13 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base, 
	return cpu_to_le32(res);

}



void iwl_nic_error(struct iwl_op_mode *op_mode)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);



	iwlagn_fw_error(priv, false);

}



void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);

drivers/net/wireless/iwlwifi/iwl-op-mode.h

+7 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ struct iwl_rx_mem_buffer; 
 *	reclaimed by the op_mode. This can happen when the driver is freed and

 *	there are Tx packets pending in the transport layer.

 *	Must be atomic

 * @nic_error: error notification. Must be atomic

 */

struct iwl_op_mode_ops {

	struct iwl_op_mode *(*start)(struct iwl_trans *trans);
@@ -100,6 +101,7 @@ struct iwl_op_mode_ops { 
	void (*queue_not_full)(struct iwl_op_mode *op_mode, u8 ac);

	void (*hw_rf_kill)(struct iwl_op_mode *op_mode, bool state);

	void (*free_skb)(struct iwl_op_mode *op_mode, struct sk_buff *skb);

	void (*nic_error)(struct iwl_op_mode *op_mode);

};



/**
@@ -151,6 +153,11 @@ static inline void iwl_op_mode_free_skb(struct iwl_op_mode *op_mode, 
	op_mode->ops->free_skb(op_mode, skb);

}



static inline void iwl_op_mode_nic_error(struct iwl_op_mode *op_mode)

{

	op_mode->ops->nic_error(op_mode);

}



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

* Op mode layers implementations

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

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

+0 −1
Original line number Diff line number Diff line
@@ -534,7 +534,6 @@ enum iwl_rxon_context_id { 


int iwlagn_hw_valid_rtc_data_addr(u32 addr);

void iwl_nic_config(struct iwl_priv *priv);

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

const char *get_cmd_string(u8 cmd);

bool iwl_check_for_ct_kill(struct iwl_priv *priv);