Commit d2dfb33e authored by Stanislaw Gruszka's avatar Stanislaw Gruszka
Browse files

iwlegacy: rename other handlers 



Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent 6e9848b4

drivers/net/wireless/iwlegacy/3945-mac.c

+10 −10
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ static void il3945_hdl_add_sta(struct il_priv *il, 
	D_RX("Received C_ADD_STA: 0x%02X\n", pkt->u.status);

}



static void il3945_rx_beacon_notif(struct il_priv *il,

static void il3945_hdl_beacon(struct il_priv *il,

				struct il_rx_buf *rxb)

{

	struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -812,7 +812,7 @@ static void il3945_rx_beacon_notif(struct il_priv *il, 


/* Handle notification from uCode that card's power state is changing

 * due to software, hardware, or critical temperature RFKILL */

static void il3945_rx_card_state_notif(struct il_priv *il,

static void il3945_hdl_card_state(struct il_priv *il,

				    struct il_rx_buf *rxb)

{

	struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -856,24 +856,24 @@ static void il3945_setup_handlers(struct il_priv *il) 
	il->handlers[N_ALIVE] = il3945_hdl_alive;

	il->handlers[C_ADD_STA] = il3945_hdl_add_sta;

	il->handlers[N_ERROR] = il_hdl_error;

	il->handlers[N_CHANNEL_SWITCH] = il_rx_csa;

	il->handlers[N_CHANNEL_SWITCH] = il_hdl_csa;

	il->handlers[N_SPECTRUM_MEASUREMENT] =

			il_rx_spectrum_measure_notif;

	il->handlers[N_PM_SLEEP] = il_rx_pm_sleep_notif;

			il_hdl_spectrum_measurement;

	il->handlers[N_PM_SLEEP] = il_hdl_pm_sleep;

	il->handlers[N_PM_DEBUG_STATS] =

	    il_rx_pm_debug_stats_notif;

	il->handlers[N_BEACON] = il3945_rx_beacon_notif;

	    il_hdl_pm_debug_stats;

	il->handlers[N_BEACON] = il3945_hdl_beacon;



	/*

	 * The same handler is used for both the REPLY to a discrete

	 * stats request from the host as well as for the periodic

	 * stats notifications (after received beacons) from the uCode.

	 */

	il->handlers[C_STATS] = il3945_reply_stats;

	il->handlers[N_STATS] = il3945_hw_rx_stats;

	il->handlers[C_STATS] = il3945_hdl_c_stats;

	il->handlers[N_STATS] = il3945_hdl_stats;



	il_setup_rx_scan_handlers(il);

	il->handlers[N_CARD_STATE] = il3945_rx_card_state_notif;

	il->handlers[N_CARD_STATE] = il3945_hdl_card_state;



	/* Set up hardware specific Rx handlers */

	il3945_hw_handler_setup(il);

drivers/net/wireless/iwlegacy/3945.c

+3 −3
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static void il3945_accumulative_stats(struct il_priv *il, 
}

#endif



void il3945_hw_rx_stats(struct il_priv *il,

void il3945_hdl_stats(struct il_priv *il,

		struct il_rx_buf *rxb)

{

	struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -426,7 +426,7 @@ void il3945_hw_rx_stats(struct il_priv *il, 
	memcpy(&il->_3945.stats, pkt->u.raw, sizeof(il->_3945.stats));

}



void il3945_reply_stats(struct il_priv *il,

void il3945_hdl_c_stats(struct il_priv *il,

			      struct il_rx_buf *rxb)

{

	struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -443,7 +443,7 @@ void il3945_reply_stats(struct il_priv *il, 
#endif

		D_RX("Statistics have been cleared\n");

	}

	il3945_hw_rx_stats(il, rxb);

	il3945_hdl_stats(il, rxb);

}

drivers/net/wireless/iwlegacy/3945.h

+2 −2
Original line number Diff line number Diff line
@@ -253,9 +253,9 @@ void il3945_hw_build_tx_cmd_rate(struct il_priv *il, 
				  int sta_id, int tx_id);

extern int il3945_hw_reg_send_txpower(struct il_priv *il);

extern int il3945_hw_reg_set_txpower(struct il_priv *il, s8 power);

extern void il3945_hw_rx_stats(struct il_priv *il,

extern void il3945_hdl_stats(struct il_priv *il,

				 struct il_rx_buf *rxb);

void il3945_reply_stats(struct il_priv *il,

void il3945_hdl_c_stats(struct il_priv *il,

			      struct il_rx_buf *rxb);

extern void il3945_disable_events(struct il_priv *il);

extern int il4965_get_temperature(const struct il_priv *il);

drivers/net/wireless/iwlegacy/4965-mac.c

+15 −15
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ int il4965_dump_fh(struct il_priv *il, char **buf, bool display) 
	}

	return 0;

}

void il4965_rx_missed_beacon_notif(struct il_priv *il,

void il4965_hdl_missed_beacon(struct il_priv *il,

				struct il_rx_buf *rxb)



{
@@ -1352,7 +1352,7 @@ static void il4965_accumulative_stats(struct il_priv *il, 


#define REG_RECALIB_PERIOD (60)



void il4965_rx_stats(struct il_priv *il,

void il4965_hdl_stats(struct il_priv *il,

			      struct il_rx_buf *rxb)

{

	int change;
@@ -1396,7 +1396,7 @@ void il4965_rx_stats(struct il_priv *il, 
		il->cfg->ops->lib->temp_ops.temperature(il);

}



void il4965_reply_stats(struct il_priv *il,

void il4965_hdl_c_stats(struct il_priv *il,

			      struct il_rx_buf *rxb)

{

	struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -1412,7 +1412,7 @@ void il4965_reply_stats(struct il_priv *il, 
#endif

		D_RX("Statistics have been cleared\n");

	}

	il4965_rx_stats(il, rxb);

	il4965_hdl_stats(il, rxb);

}
@@ -3819,7 +3819,7 @@ static void il4965_bg_stats_periodic(unsigned long data) 
	il_send_stats_request(il, CMD_ASYNC, false);

}



static void il4965_rx_beacon_notif(struct il_priv *il,

static void il4965_hdl_beacon(struct il_priv *il,

				struct il_rx_buf *rxb)

{

	struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -3861,7 +3861,7 @@ static void il4965_perform_ct_kill_task(struct il_priv *il) 


/* Handle notification from uCode that card's power state is changing

 * due to software, hardware, or critical temperature RFKILL */

static void il4965_rx_card_state_notif(struct il_priv *il,

static void il4965_hdl_card_state(struct il_priv *il,

				    struct il_rx_buf *rxb)

{

	struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -3923,30 +3923,30 @@ static void il4965_setup_handlers(struct il_priv *il) 
{

	il->handlers[N_ALIVE] = il4965_hdl_alive;

	il->handlers[N_ERROR] = il_hdl_error;

	il->handlers[N_CHANNEL_SWITCH] = il_rx_csa;

	il->handlers[N_CHANNEL_SWITCH] = il_hdl_csa;

	il->handlers[N_SPECTRUM_MEASUREMENT] =

			il_rx_spectrum_measure_notif;

	il->handlers[N_PM_SLEEP] = il_rx_pm_sleep_notif;

			il_hdl_spectrum_measurement;

	il->handlers[N_PM_SLEEP] = il_hdl_pm_sleep;

	il->handlers[N_PM_DEBUG_STATS] =

	    il_rx_pm_debug_stats_notif;

	il->handlers[N_BEACON] = il4965_rx_beacon_notif;

	    il_hdl_pm_debug_stats;

	il->handlers[N_BEACON] = il4965_hdl_beacon;



	/*

	 * The same handler is used for both the REPLY to a discrete

	 * stats request from the host as well as for the periodic

	 * stats notifications (after received beacons) from the uCode.

	 */

	il->handlers[C_STATS] = il4965_reply_stats;

	il->handlers[N_STATS] = il4965_rx_stats;

	il->handlers[C_STATS] = il4965_hdl_c_stats;

	il->handlers[N_STATS] = il4965_hdl_stats;



	il_setup_rx_scan_handlers(il);



	/* status change handler */

	il->handlers[N_CARD_STATE] =

					il4965_rx_card_state_notif;

					il4965_hdl_card_state;



	il->handlers[N_MISSED_BEACONS] =

	    il4965_rx_missed_beacon_notif;

	    il4965_hdl_missed_beacon;

	/* Rx handlers */

	il->handlers[N_RX_PHY] = il4965_hdl_rx_phy;

	il->handlers[N_RX_MPDU] = il4965_hdl_rx;

drivers/net/wireless/iwlegacy/4965.c

+2 −2
Original line number Diff line number Diff line
@@ -2122,7 +2122,7 @@ static void il4965_hdl_tx(struct il_priv *il, 
	spin_unlock_irqrestore(&il->sta_lock, flags);

}



static void il4965_rx_beacon_notif(struct il_priv *il,

static void il4965_hdl_beacon(struct il_priv *il,

				    struct il_rx_buf *rxb)

{

	struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -2148,7 +2148,7 @@ static void il4965_handler_setup(struct il_priv *il) 
	il->handlers[N_RX] = il4965_hdl_rx;

	/* Tx response */

	il->handlers[C_TX] = il4965_hdl_tx;

	il->handlers[N_BEACON] = il4965_rx_beacon_notif;

	il->handlers[N_BEACON] = il4965_hdl_beacon;

}



static struct il_hcmd_ops il4965_hcmd = {