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

Commit 5bf0dac4 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: 4965: remove one il4965_hdl_beacon 



We have two such functions.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 280ade5e

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

+1 −2
Original line number Diff line number Diff line
@@ -3780,13 +3780,12 @@ il4965_hdl_beacon(struct il_priv *il, struct il_rx_buf *rxb) 
#ifdef CONFIG_IWLEGACY_DEBUG

	u8 rate = il4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags);



	D_RX("beacon status %x retries %d iss %d " "tsf %d %d rate %d\n",

	D_RX("beacon status %x retries %d iss %d tsf:0x%.8x%.8x rate %d\n",

	     le32_to_cpu(beacon->beacon_notify_hdr.u.status) & TX_STATUS_MSK,

	     beacon->beacon_notify_hdr.failure_frame,

	     le32_to_cpu(beacon->ibss_mgr_status),

	     le32_to_cpu(beacon->high_tsf), le32_to_cpu(beacon->low_tsf), rate);

#endif



	il->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status);

}

drivers/net/wireless/iwlegacy/4965.c

+0 −19
Original line number Diff line number Diff line
@@ -2114,24 +2114,6 @@ il4965_hdl_tx(struct il_priv *il, struct il_rx_buf *rxb) 
	spin_unlock_irqrestore(&il->sta_lock, flags);

}



static void

il4965_hdl_beacon(struct il_priv *il, struct il_rx_buf *rxb)

{

	struct il_rx_pkt *pkt = rxb_addr(rxb);

	struct il4965_beacon_notif *beacon = (void *)pkt->u.raw;

	u8 rate __maybe_unused =

	    il4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags);



	D_RX("beacon status %#x, retries:%d ibssmgr:%d "

	     "tsf:0x%.8x%.8x rate:%d\n",

	     le32_to_cpu(beacon->beacon_notify_hdr.u.status) & TX_STATUS_MSK,

	     beacon->beacon_notify_hdr.failure_frame,

	     le32_to_cpu(beacon->ibss_mgr_status),

	     le32_to_cpu(beacon->high_tsf), le32_to_cpu(beacon->low_tsf), rate);



	il->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status);

}



/* Set up 4965-specific Rx frame reply handlers */

static void

il4965_handler_setup(struct il_priv *il)
@@ -2140,7 +2122,6 @@ 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_hdl_beacon;

}



static struct il_hcmd_ops il4965_hcmd = {