renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 14:14:01 +08:00
Code

iwlegacy: 4965: remove one il4965_hdl_beacon

Browse Source 
We have two such functions.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Stanislaw Gruszka 2011-12-23 08:13:47 +01:00 committed by John W. Linville
parent 280ade5ea9
commit 5bf0dac47f
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/iwlegacy/4965-mac.c
View File

@ -3780,13 +3780,12 @@ il4965_hdl_beacon(struct il_priv *il, struct il_rx_buf *rxb)
#ifdef CONFIG_IWLEGACY_DEBUG #ifdef CONFIG_IWLEGACY_DEBUG
u8 rate = il4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags); 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, le32_to_cpu(beacon->beacon_notify_hdr.u.status) & TX_STATUS_MSK,
beacon->beacon_notify_hdr.failure_frame, beacon->beacon_notify_hdr.failure_frame,
le32_to_cpu(beacon->ibss_mgr_status), le32_to_cpu(beacon->ibss_mgr_status),
le32_to_cpu(beacon->high_tsf), le32_to_cpu(beacon->low_tsf), rate); le32_to_cpu(beacon->high_tsf), le32_to_cpu(beacon->low_tsf), rate);
#endif #endif
il->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status); il->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status);
} }

19
drivers/net/wireless/iwlegacy/4965.c
View File

@ -2114,24 +2114,6 @@ il4965_hdl_tx(struct il_priv *il, struct il_rx_buf *rxb)
spin_unlock_irqrestore(&il->sta_lock, flags); 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 */ /* Set up 4965-specific Rx frame reply handlers */
static void static void
il4965_handler_setup(struct il_priv *il) 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; il->handlers[N_RX] = il4965_hdl_rx;
/* Tx response */ /* Tx response */
il->handlers[C_TX] = il4965_hdl_tx; il->handlers[C_TX] = il4965_hdl_tx;
il->handlers[N_BEACON] = il4965_hdl_beacon;
} }
static struct il_hcmd_ops il4965_hcmd = { static struct il_hcmd_ops il4965_hcmd = {