From 6dd16ff8d6948f53859a6fd9e6d3c1252a08bb27 Mon Sep 17 00:00:00 2001 From: Ben Cahill Date: Thu, 16 Aug 2007 14:49:15 -0700 Subject: [PATCH 06/31] iwlwifi: replace iwl_scanstart_notification with iwl_scanreq_notification Replace iwl_scanstart_notification with iwl_scanreq_notification. Signed-off-by: Ben Cahill Signed-off-by: Zhu Yi --- drivers/net/wireless/iwl-base.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/iwl-base.c b/drivers/net/wireless/iwl-base.c index feca1e7..78589b1 100644 --- a/drivers/net/wireless/iwl-base.c +++ b/drivers/net/wireless/iwl-base.c @@ -3992,18 +3992,20 @@ static void iwl_rx_beacon_notif(struct iwl_priv *priv, #endif } +/* Service response to REPLY_SCAN_CMD (0x80) */ static void iwl_rx_reply_scan(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) { #ifdef CONFIG_IWLWIFI_DEBUG struct iwl_rx_packet *pkt = (void *)rxb->skb->data; - struct iwl_scanstart_notification *notif = - (struct iwl_scanstart_notification *)pkt->u.raw; + struct iwl_scanreq_notification *notif = + (struct iwl_scanreq_notification *)pkt->u.raw; IWL_DEBUG_RX("Scan request status = 0x%x\n", notif->status); #endif } +/* Service SCAN_START_NOTIFICATION (0x82) */ static void iwl_rx_scan_start_notif(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) { @@ -4020,6 +4022,7 @@ static void iwl_rx_scan_start_notif(struct iwl_priv *priv, notif->tsf_low, notif->status, notif->beacon_timer); } +/* Service SCAN_RESULTS_NOTIFICATION (0x83) */ static void iwl_rx_scan_results_notif(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) { @@ -4043,6 +4046,7 @@ static void iwl_rx_scan_results_notif(struct iwl_priv *priv, priv->last_scan_jiffies = jiffies; } +/* Service SCAN_COMPLETE_NOTIFICATION (0x84) */ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) { -- 1.5.2