Merge tag 'wireless-drivers-next-for-davem-2015-06-03' of git://git.kernel.org/pub...
[pandora-kernel.git] / drivers / net / wireless / mwifiex / sta_event.c
index c9064b8..9520378 100644 (file)
@@ -48,7 +48,8 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code)
        if (!priv->media_connected)
                return;
 
-       dev_dbg(adapter->dev, "info: handles disconnect event\n");
+       mwifiex_dbg(adapter, INFO,
+                   "info: handles disconnect event\n");
 
        priv->media_connected = false;
 
@@ -104,12 +105,14 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code)
         * it could be used for re-assoc
         */
 
-       dev_dbg(adapter->dev, "info: previous SSID=%s, SSID len=%u\n",
-               priv->prev_ssid.ssid, priv->prev_ssid.ssid_len);
+       mwifiex_dbg(adapter, INFO,
+                   "info: previous SSID=%s, SSID len=%u\n",
+                   priv->prev_ssid.ssid, priv->prev_ssid.ssid_len);
 
-       dev_dbg(adapter->dev, "info: current SSID=%s, SSID len=%u\n",
-               priv->curr_bss_params.bss_descriptor.ssid.ssid,
-               priv->curr_bss_params.bss_descriptor.ssid.ssid_len);
+       mwifiex_dbg(adapter, INFO,
+                   "info: current SSID=%s, SSID len=%u\n",
+                   priv->curr_bss_params.bss_descriptor.ssid.ssid,
+                   priv->curr_bss_params.bss_descriptor.ssid.ssid_len);
 
        memcpy(&priv->prev_ssid,
               &priv->curr_bss_params.bss_descriptor.ssid,
@@ -127,9 +130,9 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code)
        if (adapter->is_cmd_timedout && adapter->curr_cmd)
                return;
        priv->media_connected = false;
-       dev_dbg(adapter->dev,
-               "info: successfully disconnected from %pM: reason code %d\n",
-               priv->cfg_bssid, reason_code);
+       mwifiex_dbg(adapter, MSG,
+                   "info: successfully disconnected from %pM: reason code %d\n",
+                   priv->cfg_bssid, reason_code);
        if (priv->bss_mode == NL80211_IFTYPE_STATION ||
            priv->bss_mode == NL80211_IFTYPE_P2P_CLIENT) {
                cfg80211_disconnected(priv->netdev, reason_code, NULL, 0,
@@ -154,13 +157,13 @@ static int mwifiex_parse_tdls_event(struct mwifiex_private *priv,
        /* reserved 2 bytes are not mandatory in tdls event */
        if (event_skb->len < (sizeof(struct mwifiex_tdls_generic_event) -
                              sizeof(u16) - sizeof(adapter->event_cause))) {
-               dev_err(adapter->dev, "Invalid event length!\n");
+               mwifiex_dbg(adapter, ERROR, "Invalid event length!\n");
                return -1;
        }
 
        sta_ptr = mwifiex_get_sta_entry(priv, tdls_evt->peer_mac);
        if (!sta_ptr) {
-               dev_err(adapter->dev, "cannot get sta entry!\n");
+               mwifiex_dbg(adapter, ERROR, "cannot get sta entry!\n");
                return -1;
        }
 
@@ -239,21 +242,21 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
 
        switch (eventcause) {
        case EVENT_DUMMY_HOST_WAKEUP_SIGNAL:
-               dev_err(adapter->dev,
-                       "invalid EVENT: DUMMY_HOST_WAKEUP_SIGNAL, ignore it\n");
+               mwifiex_dbg(adapter, ERROR,
+                           "invalid EVENT: DUMMY_HOST_WAKEUP_SIGNAL, ignore it\n");
                break;
        case EVENT_LINK_SENSED:
-               dev_dbg(adapter->dev, "event: LINK_SENSED\n");
+               mwifiex_dbg(adapter, EVENT, "event: LINK_SENSED\n");
                if (!netif_carrier_ok(priv->netdev))
                        netif_carrier_on(priv->netdev);
                mwifiex_wake_up_net_dev_queue(priv->netdev, adapter);
                break;
 
        case EVENT_DEAUTHENTICATED:
-               dev_dbg(adapter->dev, "event: Deauthenticated\n");
+               mwifiex_dbg(adapter, EVENT, "event: Deauthenticated\n");
                if (priv->wps.session_enable) {
-                       dev_dbg(adapter->dev,
-                               "info: receive deauth event in wps session\n");
+                       mwifiex_dbg(adapter, INFO,
+                                   "info: receive deauth event in wps session\n");
                        break;
                }
                adapter->dbg.num_event_deauth++;
@@ -265,10 +268,10 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                break;
 
        case EVENT_DISASSOCIATED:
-               dev_dbg(adapter->dev, "event: Disassociated\n");
+               mwifiex_dbg(adapter, EVENT, "event: Disassociated\n");
                if (priv->wps.session_enable) {
-                       dev_dbg(adapter->dev,
-                               "info: receive disassoc event in wps session\n");
+                       mwifiex_dbg(adapter, INFO,
+                                   "info: receive disassoc event in wps session\n");
                        break;
                }
                adapter->dbg.num_event_disassoc++;
@@ -280,7 +283,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                break;
 
        case EVENT_LINK_LOST:
-               dev_dbg(adapter->dev, "event: Link lost\n");
+               mwifiex_dbg(adapter, EVENT, "event: Link lost\n");
                adapter->dbg.num_event_link_lost++;
                if (priv->media_connected) {
                        reason_code =
@@ -290,7 +293,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                break;
 
        case EVENT_PS_SLEEP:
-               dev_dbg(adapter->dev, "info: EVENT: SLEEP\n");
+               mwifiex_dbg(adapter, EVENT, "info: EVENT: SLEEP\n");
 
                adapter->ps_state = PS_STATE_PRE_SLEEP;
 
@@ -298,12 +301,12 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                break;
 
        case EVENT_PS_AWAKE:
-               dev_dbg(adapter->dev, "info: EVENT: AWAKE\n");
+               mwifiex_dbg(adapter, EVENT, "info: EVENT: AWAKE\n");
                if (!adapter->pps_uapsd_mode &&
                    priv->media_connected && adapter->sleep_period.period) {
                                adapter->pps_uapsd_mode = true;
-                               dev_dbg(adapter->dev,
-                                       "event: PPS/UAPSD mode activated\n");
+                               mwifiex_dbg(adapter, EVENT,
+                                           "event: PPS/UAPSD mode activated\n");
                }
                adapter->tx_lock_flag = false;
                if (adapter->pps_uapsd_mode && adapter->gen_null_pkt) {
@@ -333,26 +336,26 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
 
        case EVENT_DEEP_SLEEP_AWAKE:
                adapter->if_ops.wakeup_complete(adapter);
-               dev_dbg(adapter->dev, "event: DS_AWAKE\n");
+               mwifiex_dbg(adapter, EVENT, "event: DS_AWAKE\n");
                if (adapter->is_deep_sleep)
                        adapter->is_deep_sleep = false;
                break;
 
        case EVENT_HS_ACT_REQ:
-               dev_dbg(adapter->dev, "event: HS_ACT_REQ\n");
+               mwifiex_dbg(adapter, EVENT, "event: HS_ACT_REQ\n");
                ret = mwifiex_send_cmd(priv, HostCmd_CMD_802_11_HS_CFG_ENH,
                                       0, 0, NULL, false);
                break;
 
        case EVENT_MIC_ERR_UNICAST:
-               dev_dbg(adapter->dev, "event: UNICAST MIC ERROR\n");
+               mwifiex_dbg(adapter, EVENT, "event: UNICAST MIC ERROR\n");
                cfg80211_michael_mic_failure(priv->netdev, priv->cfg_bssid,
                                             NL80211_KEYTYPE_PAIRWISE,
                                             -1, NULL, GFP_KERNEL);
                break;
 
        case EVENT_MIC_ERR_MULTICAST:
-               dev_dbg(adapter->dev, "event: MULTICAST MIC ERROR\n");
+               mwifiex_dbg(adapter, EVENT, "event: MULTICAST MIC ERROR\n");
                cfg80211_michael_mic_failure(priv->netdev, priv->cfg_bssid,
                                             NL80211_KEYTYPE_GROUP,
                                             -1, NULL, GFP_KERNEL);
@@ -362,7 +365,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                break;
 
        case EVENT_ADHOC_BCN_LOST:
-               dev_dbg(adapter->dev, "event: ADHOC_BCN_LOST\n");
+               mwifiex_dbg(adapter, EVENT, "event: ADHOC_BCN_LOST\n");
                priv->adhoc_is_link_sensed = false;
                mwifiex_clean_txrx(priv);
                mwifiex_stop_net_dev_queue(priv->netdev, adapter);
@@ -371,17 +374,17 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                break;
 
        case EVENT_BG_SCAN_REPORT:
-               dev_dbg(adapter->dev, "event: BGS_REPORT\n");
+               mwifiex_dbg(adapter, EVENT, "event: BGS_REPORT\n");
                ret = mwifiex_send_cmd(priv, HostCmd_CMD_802_11_BG_SCAN_QUERY,
                                       HostCmd_ACT_GEN_GET, 0, NULL, false);
                break;
 
        case EVENT_PORT_RELEASE:
-               dev_dbg(adapter->dev, "event: PORT RELEASE\n");
+               mwifiex_dbg(adapter, EVENT, "event: PORT RELEASE\n");
                break;
 
        case EVENT_EXT_SCAN_REPORT:
-               dev_dbg(adapter->dev, "event: EXT_SCAN Report\n");
+               mwifiex_dbg(adapter, EVENT, "event: EXT_SCAN Report\n");
                if (adapter->ext_scan)
                        ret = mwifiex_handle_event_ext_scan_report(priv,
                                                adapter->event_skb->data);
@@ -389,7 +392,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                break;
 
        case EVENT_WMM_STATUS_CHANGE:
-               dev_dbg(adapter->dev, "event: WMM status changed\n");
+               mwifiex_dbg(adapter, EVENT, "event: WMM status changed\n");
                ret = mwifiex_send_cmd(priv, HostCmd_CMD_WMM_GET_STATUS,
                                       0, 0, NULL, false);
                break;
@@ -401,13 +404,13 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                mwifiex_send_cmd(priv, HostCmd_CMD_RSSI_INFO,
                                 HostCmd_ACT_GEN_GET, 0, NULL, false);
                priv->subsc_evt_rssi_state = RSSI_LOW_RECVD;
-               dev_dbg(adapter->dev, "event: Beacon RSSI_LOW\n");
+               mwifiex_dbg(adapter, EVENT, "event: Beacon RSSI_LOW\n");
                break;
        case EVENT_SNR_LOW:
-               dev_dbg(adapter->dev, "event: Beacon SNR_LOW\n");
+               mwifiex_dbg(adapter, EVENT, "event: Beacon SNR_LOW\n");
                break;
        case EVENT_MAX_FAIL:
-               dev_dbg(adapter->dev, "event: MAX_FAIL\n");
+               mwifiex_dbg(adapter, EVENT, "event: MAX_FAIL\n");
                break;
        case EVENT_RSSI_HIGH:
                cfg80211_cqm_rssi_notify(priv->netdev,
@@ -416,47 +419,47 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                mwifiex_send_cmd(priv, HostCmd_CMD_RSSI_INFO,
                                 HostCmd_ACT_GEN_GET, 0, NULL, false);
                priv->subsc_evt_rssi_state = RSSI_HIGH_RECVD;
-               dev_dbg(adapter->dev, "event: Beacon RSSI_HIGH\n");
+               mwifiex_dbg(adapter, EVENT, "event: Beacon RSSI_HIGH\n");
                break;
        case EVENT_SNR_HIGH:
-               dev_dbg(adapter->dev, "event: Beacon SNR_HIGH\n");
+               mwifiex_dbg(adapter, EVENT, "event: Beacon SNR_HIGH\n");
                break;
        case EVENT_DATA_RSSI_LOW:
-               dev_dbg(adapter->dev, "event: Data RSSI_LOW\n");
+               mwifiex_dbg(adapter, EVENT, "event: Data RSSI_LOW\n");
                break;
        case EVENT_DATA_SNR_LOW:
-               dev_dbg(adapter->dev, "event: Data SNR_LOW\n");
+               mwifiex_dbg(adapter, EVENT, "event: Data SNR_LOW\n");
                break;
        case EVENT_DATA_RSSI_HIGH:
-               dev_dbg(adapter->dev, "event: Data RSSI_HIGH\n");
+               mwifiex_dbg(adapter, EVENT, "event: Data RSSI_HIGH\n");
                break;
        case EVENT_DATA_SNR_HIGH:
-               dev_dbg(adapter->dev, "event: Data SNR_HIGH\n");
+               mwifiex_dbg(adapter, EVENT, "event: Data SNR_HIGH\n");
                break;
        case EVENT_LINK_QUALITY:
-               dev_dbg(adapter->dev, "event: Link Quality\n");
+               mwifiex_dbg(adapter, EVENT, "event: Link Quality\n");
                break;
        case EVENT_PRE_BEACON_LOST:
-               dev_dbg(adapter->dev, "event: Pre-Beacon Lost\n");
+               mwifiex_dbg(adapter, EVENT, "event: Pre-Beacon Lost\n");
                break;
        case EVENT_IBSS_COALESCED:
-               dev_dbg(adapter->dev, "event: IBSS_COALESCED\n");
+               mwifiex_dbg(adapter, EVENT, "event: IBSS_COALESCED\n");
                ret = mwifiex_send_cmd(priv,
                                HostCmd_CMD_802_11_IBSS_COALESCING_STATUS,
                                HostCmd_ACT_GEN_GET, 0, NULL, false);
                break;
        case EVENT_ADDBA:
-               dev_dbg(adapter->dev, "event: ADDBA Request\n");
+               mwifiex_dbg(adapter, EVENT, "event: ADDBA Request\n");
                mwifiex_send_cmd(priv, HostCmd_CMD_11N_ADDBA_RSP,
                                 HostCmd_ACT_GEN_SET, 0,
                                 adapter->event_body, false);
                break;
        case EVENT_DELBA:
-               dev_dbg(adapter->dev, "event: DELBA Request\n");
+               mwifiex_dbg(adapter, EVENT, "event: DELBA Request\n");
                mwifiex_11n_delete_ba_stream(priv, adapter->event_body);
                break;
        case EVENT_BA_STREAM_TIEMOUT:
-               dev_dbg(adapter->dev, "event:  BA Stream timeout\n");
+               mwifiex_dbg(adapter, EVENT, "event:  BA Stream timeout\n");
                mwifiex_11n_ba_stream_timeout(priv,
                                              (struct host_cmd_ds_11n_batimeout
                                               *)
@@ -464,28 +467,31 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                break;
        case EVENT_AMSDU_AGGR_CTRL:
                ctrl = le16_to_cpu(*(__le16 *)adapter->event_body);
-               dev_dbg(adapter->dev, "event: AMSDU_AGGR_CTRL %d\n", ctrl);
+               mwifiex_dbg(adapter, EVENT,
+                           "event: AMSDU_AGGR_CTRL %d\n", ctrl);
 
                adapter->tx_buf_size =
                                min_t(u16, adapter->curr_tx_buf_size, ctrl);
-               dev_dbg(adapter->dev, "event: tx_buf_size %d\n",
-                       adapter->tx_buf_size);
+               mwifiex_dbg(adapter, EVENT, "event: tx_buf_size %d\n",
+                           adapter->tx_buf_size);
                break;
 
        case EVENT_WEP_ICV_ERR:
-               dev_dbg(adapter->dev, "event: WEP ICV error\n");
+               mwifiex_dbg(adapter, EVENT, "event: WEP ICV error\n");
                break;
 
        case EVENT_BW_CHANGE:
-               dev_dbg(adapter->dev, "event: BW Change\n");
+               mwifiex_dbg(adapter, EVENT, "event: BW Change\n");
                break;
 
        case EVENT_HOSTWAKE_STAIE:
-               dev_dbg(adapter->dev, "event: HOSTWAKE_STAIE %d\n", eventcause);
+               mwifiex_dbg(adapter, EVENT,
+                           "event: HOSTWAKE_STAIE %d\n", eventcause);
                break;
 
        case EVENT_REMAIN_ON_CHAN_EXPIRED:
-               dev_dbg(adapter->dev, "event: Remain on channel expired\n");
+               mwifiex_dbg(adapter, EVENT,
+                           "event: Remain on channel expired\n");
                cfg80211_remain_on_channel_expired(&priv->wdev,
                                                   priv->roc_cfg.cookie,
                                                   &priv->roc_cfg.chan,
@@ -496,7 +502,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                break;
 
        case EVENT_CHANNEL_SWITCH_ANN:
-               dev_dbg(adapter->dev, "event: Channel Switch Announcement\n");
+               mwifiex_dbg(adapter, EVENT, "event: Channel Switch Announcement\n");
                priv->csa_expire_time =
                                jiffies + msecs_to_jiffies(DFS_CHAN_MOVE_TIME);
                priv->csa_chan = priv->curr_bss_params.bss_descriptor.channel;
@@ -511,23 +517,23 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                break;
 
        case EVENT_TX_STATUS_REPORT:
-               dev_dbg(adapter->dev, "event: TX_STATUS Report\n");
+               mwifiex_dbg(adapter, EVENT, "event: TX_STATUS Report\n");
                mwifiex_parse_tx_status_event(priv, adapter->event_body);
                break;
 
        case EVENT_CHANNEL_REPORT_RDY:
-               dev_dbg(adapter->dev, "event: Channel Report\n");
+               mwifiex_dbg(adapter, EVENT, "event: Channel Report\n");
                ret = mwifiex_11h_handle_chanrpt_ready(priv,
                                                       adapter->event_skb);
                break;
        case EVENT_RADAR_DETECTED:
-               dev_dbg(adapter->dev, "event: Radar detected\n");
+               mwifiex_dbg(adapter, EVENT, "event: Radar detected\n");
                ret = mwifiex_11h_handle_radar_detected(priv,
                                                        adapter->event_skb);
                break;
        default:
-               dev_dbg(adapter->dev, "event: unknown event id: %#x\n",
-                       eventcause);
+               mwifiex_dbg(adapter, ERROR, "event: unknown event id: %#x\n",
+                           eventcause);
                break;
        }