iwmc3200wifi: refuse to associate on unallowed channels

[safe/jmp/linux-2.6] / drivers / net / wireless / iwmc3200wifi / commands.c

diff --git a/drivers/net/wireless/iwmc3200wifi/commands.c b/drivers/net/wireless/iwmc3200wifi/commands.c
index 1e41ad0..9ef4fd0 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/commands.c
+++ b/drivers/net/wireless/iwmc3200wifi/commands.c
@@ -781,10 +781,9 @@ int iwm_send_mlme_profile(struct iwm_priv *iwm)
        return 0;
 }
 
-int iwm_invalidate_mlme_profile(struct iwm_priv *iwm)
+int __iwm_invalidate_mlme_profile(struct iwm_priv *iwm)
 {
        struct iwm_umac_invalidate_profile invalid;
-       int ret;
 
        invalid.hdr.oid = UMAC_WIFI_IF_CMD_INVALIDATE_PROFILE;
        invalid.hdr.buf_size =
@@ -793,7 +792,14 @@ int iwm_invalidate_mlme_profile(struct iwm_priv *iwm)
 
        invalid.reason = WLAN_REASON_UNSPECIFIED;
 
-       ret = iwm_send_wifi_if_cmd(iwm, &invalid, sizeof(invalid), 1);
+       return iwm_send_wifi_if_cmd(iwm, &invalid, sizeof(invalid), 1);
+}
+
+int iwm_invalidate_mlme_profile(struct iwm_priv *iwm)
+{
+       int ret;
+
+       ret = __iwm_invalidate_mlme_profile(iwm);
        if (ret)
                return ret;