Merge remote branch 'wireless-next/master' into ath6kl-next

[cascardo/linux.git] / drivers / net / wireless / ath / ath6kl / wmi.c

diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 573cb26..7654e8e 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -127,7 +127,7 @@ int ath6kl_wmi_dix_2_dot3(struct wmi *wmi, struct sk_buff *skb)
 
        if (!is_ethertype(be16_to_cpu(type))) {
                ath6kl_dbg(ATH6KL_DBG_WMI,
-                       "%s: pkt is already in 802.3 format\n", __func__);
+                          "%s: pkt is already in 802.3 format\n", __func__);
                return 0;
        }
 
@@ -557,7 +557,8 @@ static int ath6kl_wmi_rx_probe_req_event_rx(struct wmi *wmi, u8 *datap, int len,
                   dlen, freq, vif->probe_req_report);
 
        if (vif->probe_req_report || vif->nw_type == AP_NETWORK)
-               cfg80211_rx_mgmt(vif->ndev, freq, ev->data, dlen, GFP_ATOMIC);
+               cfg80211_rx_mgmt(vif->ndev, freq, 0,
+                                ev->data, dlen, GFP_ATOMIC);
 
        return 0;
 }
@@ -596,7 +597,8 @@ static int ath6kl_wmi_rx_action_event_rx(struct wmi *wmi, u8 *datap, int len,
                return -EINVAL;
        }
        ath6kl_dbg(ATH6KL_DBG_WMI, "rx_action: len=%u freq=%u\n", dlen, freq);
-       cfg80211_rx_mgmt(vif->ndev, freq, ev->data, dlen, GFP_ATOMIC);
+       cfg80211_rx_mgmt(vif->ndev, freq, 0,
+                        ev->data, dlen, GFP_ATOMIC);
 
        return 0;
 }
@@ -826,8 +828,8 @@ static int ath6kl_wmi_connect_event_rx(struct wmi *wmi, u8 *datap, int len,
                        if (pie[1] > 3 && pie[2] == 0x00 && pie[3] == 0x50 &&
                            pie[4] == 0xf2 && pie[5] == WMM_OUI_TYPE) {
                                /* WMM OUT (00:50:F2) */
-                               if (pie[1] > 5
-                                   && pie[6] == WMM_PARAM_OUI_SUBTYPE)
+                               if (pie[1] > 5 &&
+                                   pie[6] == WMM_PARAM_OUI_SUBTYPE)
                                        wmi->is_wmm_enabled = true;
                        }
                        break;
@@ -911,7 +913,7 @@ static void ath6kl_wmi_regdomain_event(struct wmi *wmi, u8 *datap, int len)
                regpair = ath6kl_get_regpair((u16) reg_code);
                country = ath6kl_regd_find_country_by_rd((u16) reg_code);
                ath6kl_dbg(ATH6KL_DBG_WMI, "Regpair used: 0x%0x\n",
-                               regpair->regDmnEnum);
+                          regpair->regDmnEnum);
        }
 
        if (country && wmi->parent_dev->wiphy_registered) {
@@ -921,7 +923,7 @@ static void ath6kl_wmi_regdomain_event(struct wmi *wmi, u8 *datap, int len)
                regulatory_hint(wmi->parent_dev->wiphy, alpha2);
 
                ath6kl_dbg(ATH6KL_DBG_WMI, "Country alpha2 being used: %c%c\n",
-                               alpha2[0], alpha2[1]);
+                          alpha2[0], alpha2[1]);
        }
 }
 
@@ -1032,8 +1034,9 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len,
        if (len < 8 + 2 + 2)
                return -EINVAL;
 
-       if (bih->frame_type == BEACON_FTYPE && test_bit(CONNECTED, &vif->flags)
-           && memcmp(bih->bssid, vif->bssid, ETH_ALEN) == 0) {
+       if (bih->frame_type == BEACON_FTYPE &&
+           test_bit(CONNECTED, &vif->flags) &&
+           memcmp(bih->bssid, vif->bssid, ETH_ALEN) == 0) {
                const u8 *tim;
                tim = cfg80211_find_ie(WLAN_EID_TIM, buf + 8 + 2 + 2,
                                       len - 8 - 2 - 2);
@@ -1365,8 +1368,8 @@ static int ath6kl_wmi_rssi_threshold_event_rx(struct wmi *wmi, u8 *datap,
                /* Upper threshold breached */
                if (rssi < sq_thresh->upper_threshold[0]) {
                        ath6kl_dbg(ATH6KL_DBG_WMI,
-                               "spurious upper rssi threshold event: %d\n",
-                               rssi);
+                                  "spurious upper rssi threshold event: %d\n",
+                                  rssi);
                } else if ((rssi < sq_thresh->upper_threshold[1]) &&
                           (rssi >= sq_thresh->upper_threshold[0])) {
                        new_threshold = WMI_RSSI_THRESHOLD1_ABOVE;
@@ -1389,7 +1392,7 @@ static int ath6kl_wmi_rssi_threshold_event_rx(struct wmi *wmi, u8 *datap,
                /* Lower threshold breached */
                if (rssi > sq_thresh->lower_threshold[0]) {
                        ath6kl_dbg(ATH6KL_DBG_WMI,
-                               "spurious lower rssi threshold event: %d %d\n",
+                                  "spurious lower rssi threshold event: %d %d\n",
                                rssi, sq_thresh->lower_threshold[0]);
                } else if ((rssi > sq_thresh->lower_threshold[1]) &&
                           (rssi <= sq_thresh->lower_threshold[0])) {
@@ -1550,8 +1553,8 @@ static int ath6kl_wmi_snr_threshold_event_rx(struct wmi *wmi, u8 *datap,
                /* Upper threshold breached */
                if (snr < sq_thresh->upper_threshold[0]) {
                        ath6kl_dbg(ATH6KL_DBG_WMI,
-                               "spurious upper snr threshold event: %d\n",
-                               snr);
+                                  "spurious upper snr threshold event: %d\n",
+                                  snr);
                } else if ((snr < sq_thresh->upper_threshold[1]) &&
                           (snr >= sq_thresh->upper_threshold[0])) {
                        new_threshold = WMI_SNR_THRESHOLD1_ABOVE;
@@ -1568,8 +1571,8 @@ static int ath6kl_wmi_snr_threshold_event_rx(struct wmi *wmi, u8 *datap,
                /* Lower threshold breached */
                if (snr > sq_thresh->lower_threshold[0]) {
                        ath6kl_dbg(ATH6KL_DBG_WMI,
-                               "spurious lower snr threshold event: %d\n",
-                               sq_thresh->lower_threshold[0]);
+                                  "spurious lower snr threshold event: %d\n",
+                                  sq_thresh->lower_threshold[0]);
                } else if ((snr > sq_thresh->lower_threshold[1]) &&
                           (snr <= sq_thresh->lower_threshold[0])) {
                        new_threshold = WMI_SNR_THRESHOLD4_BELOW;
@@ -2632,7 +2635,7 @@ int ath6kl_wmi_set_wow_mode_cmd(struct wmi *wmi, u8 if_idx,
        int ret;
 
        if ((wow_mode != ATH6KL_WOW_MODE_ENABLE) &&
-            wow_mode != ATH6KL_WOW_MODE_DISABLE) {
+           wow_mode != ATH6KL_WOW_MODE_DISABLE) {
                ath6kl_err("invalid wow mode: %d\n", wow_mode);
                return -EINVAL;
        }
@@ -3029,6 +3032,9 @@ int ath6kl_wmi_ap_set_mlme(struct wmi *wmip, u8 if_idx, u8 cmd, const u8 *mac,
        cm->reason = cpu_to_le16(reason);
        cm->cmd = cmd;
 
+       ath6kl_dbg(ATH6KL_DBG_WMI, "ap_set_mlme: cmd=%d reason=%d\n", cm->cmd,
+                  cm->reason);
+
        return ath6kl_wmi_cmd_send(wmip, if_idx, skb, WMI_AP_SET_MLME_CMDID,
                                   NO_SYNC_WMIFLAG);
 }