headers: remove sched.h from interrupt.h
[safe/jmp/linux-2.6] / drivers / net / wireless / iwmc3200wifi / cfg80211.c
index d0629d4..f3c5565 100644 (file)
@@ -23,6 +23,7 @@
 
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
+#include <linux/sched.h>
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
 #include <linux/ieee80211.h>
@@ -158,34 +159,6 @@ static int iwm_key_init(struct iwm_key *key, u8 key_index,
        return 0;
 }
 
-static int iwm_reset_profile(struct iwm_priv *iwm)
-{
-       int ret;
-
-       if (!iwm->umac_profile_active)
-               return 0;
-
-       /*
-        * If there is a current active profile, but no
-        * default key, it's not worth trying to associate again.
-        */
-       if (iwm->default_key < 0)
-               return 0;
-
-       /*
-        * Here we have an active profile, but a key setting changed.
-        * We thus have to invalidate the current profile, and push the
-        * new one. Keys will be pushed when association takes place.
-        */
-       ret = iwm_invalidate_mlme_profile(iwm);
-       if (ret < 0) {
-               IWM_ERR(iwm, "Couldn't invalidate profile\n");
-               return ret;
-       }
-
-       return iwm_send_mlme_profile(iwm);
-}
-
 static int iwm_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
                                u8 key_index, const u8 *mac_addr,
                                struct key_params *params)
@@ -203,32 +176,6 @@ static int iwm_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
                return ret;
        }
 
-       /*
-        * The WEP keys can be set before or after setting the essid.
-        * We need to handle both cases by simply pushing the keys after
-        * we send the profile.
-        * If the profile is not set yet (i.e. we're pushing keys before
-        * the essid), we set the cipher appropriately.
-        * If the profile is set, we havent associated yet because our
-        * cipher was incorrectly set. So we invalidate and send the
-        * profile again.
-        */
-       if (key->cipher == WLAN_CIPHER_SUITE_WEP40 ||
-           key->cipher == WLAN_CIPHER_SUITE_WEP104) {
-               u8 *ucast_cipher = &iwm->umac_profile->sec.ucast_cipher;
-               u8 *mcast_cipher = &iwm->umac_profile->sec.mcast_cipher;
-
-               IWM_DBG_WEXT(iwm, DBG, "WEP key\n");
-
-               if (key->cipher == WLAN_CIPHER_SUITE_WEP40)
-                       *ucast_cipher = *mcast_cipher = UMAC_CIPHER_TYPE_WEP_40;
-               if (key->cipher == WLAN_CIPHER_SUITE_WEP104)
-                       *ucast_cipher = *mcast_cipher =
-                               UMAC_CIPHER_TYPE_WEP_104;
-
-               return iwm_reset_profile(iwm);
-       }
-
        return iwm_set_key(iwm, 0, key);
 }
 
@@ -271,10 +218,6 @@ static int iwm_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
        if (key_index == iwm->default_key)
                iwm->default_key = -1;
 
-       /* If the interface is down, we just cache this */
-       if (!test_bit(IWM_STATUS_READY, &iwm->status))
-               return 0;
-
        return iwm_set_key(iwm, 1, key);
 }
 
@@ -283,7 +226,6 @@ static int iwm_cfg80211_set_default_key(struct wiphy *wiphy,
                                        u8 key_index)
 {
        struct iwm_priv *iwm = ndev_to_iwm(ndev);
-       int ret;
 
        IWM_DBG_WEXT(iwm, DBG, "Default key index is: %d\n", key_index);
 
@@ -294,15 +236,27 @@ static int iwm_cfg80211_set_default_key(struct wiphy *wiphy,
 
        iwm->default_key = key_index;
 
-       /* If the interface is down, we just cache this */
-       if (!test_bit(IWM_STATUS_READY, &iwm->status))
-               return 0;
+       return iwm_set_tx_key(iwm, key_index);
+}
 
-       ret = iwm_set_tx_key(iwm, key_index);
-       if (ret < 0)
-               return ret;
+static int iwm_cfg80211_get_station(struct wiphy *wiphy,
+                                   struct net_device *ndev,
+                                   u8 *mac, struct station_info *sinfo)
+{
+       struct iwm_priv *iwm = ndev_to_iwm(ndev);
+
+       if (memcmp(mac, iwm->bssid, ETH_ALEN))
+               return -ENOENT;
+
+       sinfo->filled |= STATION_INFO_TX_BITRATE;
+       sinfo->txrate.legacy = iwm->rate * 10;
 
-       return iwm_reset_profile(iwm);
+       if (test_bit(IWM_STATUS_ASSOCIATED, &iwm->status)) {
+               sinfo->filled |= STATION_INFO_SIGNAL;
+               sinfo->signal = iwm->wstats.qual.level;
+       }
+
+       return 0;
 }
 
 
@@ -374,11 +328,8 @@ static int iwm_cfg80211_change_iface(struct wiphy *wiphy,
 
        iwm->umac_profile->mode = cpu_to_le32(iwm->conf.mode);
 
-       if (iwm->umac_profile_active) {
-               int ret = iwm_invalidate_mlme_profile(iwm);
-               if (ret < 0)
-                       IWM_ERR(iwm, "Couldn't invalidate profile\n");
-       }
+       if (iwm->umac_profile_active)
+               iwm_invalidate_mlme_profile(iwm);
 
        return 0;
 }
@@ -500,6 +451,234 @@ static int iwm_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
        return 0;
 }
 
+static int iwm_set_auth_type(struct iwm_priv *iwm,
+                            enum nl80211_auth_type sme_auth_type)
+{
+       u8 *auth_type = &iwm->umac_profile->sec.auth_type;
+
+       switch (sme_auth_type) {
+       case NL80211_AUTHTYPE_AUTOMATIC:
+       case NL80211_AUTHTYPE_OPEN_SYSTEM:
+               IWM_DBG_WEXT(iwm, DBG, "OPEN auth\n");
+               *auth_type = UMAC_AUTH_TYPE_OPEN;
+               break;
+       case NL80211_AUTHTYPE_SHARED_KEY:
+               if (iwm->umac_profile->sec.flags &
+                   (UMAC_SEC_FLG_WPA_ON_MSK | UMAC_SEC_FLG_RSNA_ON_MSK)) {
+                       IWM_DBG_WEXT(iwm, DBG, "WPA auth alg\n");
+                       *auth_type = UMAC_AUTH_TYPE_RSNA_PSK;
+               } else {
+                       IWM_DBG_WEXT(iwm, DBG, "WEP shared key auth alg\n");
+                       *auth_type = UMAC_AUTH_TYPE_LEGACY_PSK;
+               }
+
+               break;
+       default:
+               IWM_ERR(iwm, "Unsupported auth alg: 0x%x\n", sme_auth_type);
+               return -ENOTSUPP;
+       }
+
+       return 0;
+}
+
+static int iwm_set_wpa_version(struct iwm_priv *iwm, u32 wpa_version)
+{
+       IWM_DBG_WEXT(iwm, DBG, "wpa_version: %d\n", wpa_version);
+
+       if (!wpa_version) {
+               iwm->umac_profile->sec.flags = UMAC_SEC_FLG_LEGACY_PROFILE;
+               return 0;
+       }
+
+       if (wpa_version & NL80211_WPA_VERSION_2)
+               iwm->umac_profile->sec.flags = UMAC_SEC_FLG_RSNA_ON_MSK;
+
+       if (wpa_version & NL80211_WPA_VERSION_1)
+               iwm->umac_profile->sec.flags |= UMAC_SEC_FLG_WPA_ON_MSK;
+
+       return 0;
+}
+
+static int iwm_set_cipher(struct iwm_priv *iwm, u32 cipher, bool ucast)
+{
+       u8 *profile_cipher = ucast ? &iwm->umac_profile->sec.ucast_cipher :
+               &iwm->umac_profile->sec.mcast_cipher;
+
+       if (!cipher) {
+               *profile_cipher = UMAC_CIPHER_TYPE_NONE;
+               return 0;
+       }
+
+       IWM_DBG_WEXT(iwm, DBG, "%ccast cipher is 0x%x\n", ucast ? 'u' : 'm',
+                    cipher);
+
+       switch (cipher) {
+       case IW_AUTH_CIPHER_NONE:
+               *profile_cipher = UMAC_CIPHER_TYPE_NONE;
+               break;
+       case WLAN_CIPHER_SUITE_WEP40:
+               *profile_cipher = UMAC_CIPHER_TYPE_WEP_40;
+               break;
+       case WLAN_CIPHER_SUITE_WEP104:
+               *profile_cipher = UMAC_CIPHER_TYPE_WEP_104;
+               break;
+       case WLAN_CIPHER_SUITE_TKIP:
+               *profile_cipher = UMAC_CIPHER_TYPE_TKIP;
+               break;
+       case WLAN_CIPHER_SUITE_CCMP:
+               *profile_cipher = UMAC_CIPHER_TYPE_CCMP;
+               break;
+       default:
+               IWM_ERR(iwm, "Unsupported cipher: 0x%x\n", cipher);
+               return -ENOTSUPP;
+       }
+
+       return 0;
+}
+
+static int iwm_set_key_mgt(struct iwm_priv *iwm, u32 key_mgt)
+{
+       u8 *auth_type = &iwm->umac_profile->sec.auth_type;
+
+       IWM_DBG_WEXT(iwm, DBG, "key_mgt: 0x%x\n", key_mgt);
+
+       if (key_mgt == WLAN_AKM_SUITE_8021X)
+               *auth_type = UMAC_AUTH_TYPE_8021X;
+       else if (key_mgt == WLAN_AKM_SUITE_PSK) {
+               if (iwm->umac_profile->sec.flags &
+                   (UMAC_SEC_FLG_WPA_ON_MSK | UMAC_SEC_FLG_RSNA_ON_MSK))
+                       *auth_type = UMAC_AUTH_TYPE_RSNA_PSK;
+               else
+                       *auth_type = UMAC_AUTH_TYPE_LEGACY_PSK;
+       } else {
+               IWM_ERR(iwm, "Invalid key mgt: 0x%x\n", key_mgt);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+
+static int iwm_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
+                                struct cfg80211_connect_params *sme)
+{
+       struct iwm_priv *iwm = wiphy_to_iwm(wiphy);
+       struct ieee80211_channel *chan = sme->channel;
+       struct key_params key_param;
+       int ret;
+
+       if (!test_bit(IWM_STATUS_READY, &iwm->status))
+               return -EIO;
+
+       if (!sme->ssid)
+               return -EINVAL;
+
+       if (iwm->umac_profile_active) {
+               ret = iwm_invalidate_mlme_profile(iwm);
+               if (ret) {
+                       IWM_ERR(iwm, "Couldn't invalidate profile\n");
+                       return ret;
+               }
+       }
+
+       if (chan)
+               iwm->channel =
+                       ieee80211_frequency_to_channel(chan->center_freq);
+
+       iwm->umac_profile->ssid.ssid_len = sme->ssid_len;
+       memcpy(iwm->umac_profile->ssid.ssid, sme->ssid, sme->ssid_len);
+
+       if (sme->bssid) {
+               IWM_DBG_WEXT(iwm, DBG, "BSSID: %pM\n", sme->bssid);
+               memcpy(&iwm->umac_profile->bssid[0], sme->bssid, ETH_ALEN);
+               iwm->umac_profile->bss_num = 1;
+       } else {
+               memset(&iwm->umac_profile->bssid[0], 0, ETH_ALEN);
+               iwm->umac_profile->bss_num = 0;
+       }
+
+       ret = iwm_set_wpa_version(iwm, sme->crypto.wpa_versions);
+       if (ret < 0)
+               return ret;
+
+       ret = iwm_set_auth_type(iwm, sme->auth_type);
+       if (ret < 0)
+               return ret;
+
+       if (sme->crypto.n_ciphers_pairwise) {
+               ret = iwm_set_cipher(iwm, sme->crypto.ciphers_pairwise[0],
+                                    true);
+               if (ret < 0)
+                       return ret;
+       }
+
+       ret = iwm_set_cipher(iwm, sme->crypto.cipher_group, false);
+       if (ret < 0)
+               return ret;
+
+       if (sme->crypto.n_akm_suites) {
+               ret = iwm_set_key_mgt(iwm, sme->crypto.akm_suites[0]);
+               if (ret < 0)
+                       return ret;
+       }
+
+       /*
+        * We save the WEP key in case we want to do shared authentication.
+        * We have to do it so because UMAC will assert whenever it gets a
+        * key before a profile.
+        */
+       if (sme->key) {
+               key_param.key = kmemdup(sme->key, sme->key_len, GFP_KERNEL);
+               if (key_param.key == NULL)
+                       return -ENOMEM;
+               key_param.key_len = sme->key_len;
+               key_param.seq_len = 0;
+               key_param.cipher = sme->crypto.ciphers_pairwise[0];
+
+               ret = iwm_key_init(&iwm->keys[sme->key_idx], sme->key_idx,
+                                  NULL, &key_param);
+               kfree(key_param.key);
+               if (ret < 0) {
+                       IWM_ERR(iwm, "Invalid key_params\n");
+                       return ret;
+               }
+
+               iwm->default_key = sme->key_idx;
+       }
+
+       ret = iwm_send_mlme_profile(iwm);
+
+       if (iwm->umac_profile->sec.auth_type != UMAC_AUTH_TYPE_LEGACY_PSK ||
+           sme->key == NULL)
+               return ret;
+
+       /*
+        * We want to do shared auth.
+        * We need to actually set the key we previously cached,
+        * and then tell the UMAC it's the default one.
+        * That will trigger the auth+assoc UMAC machinery, and again,
+        * this must be done after setting the profile.
+        */
+       ret = iwm_set_key(iwm, 0, &iwm->keys[sme->key_idx]);
+       if (ret < 0)
+               return ret;
+
+       return iwm_set_tx_key(iwm, iwm->default_key);
+}
+
+static int iwm_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
+                                  u16 reason_code)
+{
+       struct iwm_priv *iwm = wiphy_to_iwm(wiphy);
+
+       IWM_DBG_WEXT(iwm, DBG, "Active: %d\n", iwm->umac_profile_active);
+
+       if (iwm->umac_profile_active)
+               iwm_invalidate_mlme_profile(iwm);
+
+       return 0;
+}
+
 static int iwm_cfg80211_set_txpower(struct wiphy *wiphy,
                                    enum tx_power_setting type, int dbm)
 {
@@ -522,18 +701,50 @@ static int iwm_cfg80211_get_txpower(struct wiphy *wiphy, int *dbm)
        return 0;
 }
 
+static int iwm_cfg80211_set_power_mgmt(struct wiphy *wiphy,
+                                      struct net_device *dev,
+                                      bool enabled, int timeout)
+{
+       struct iwm_priv *iwm = wiphy_to_iwm(wiphy);
+       u32 power_index;
+
+       if (enabled)
+               power_index = IWM_POWER_INDEX_DEFAULT;
+       else
+               power_index = IWM_POWER_INDEX_MIN;
+
+       if (power_index == iwm->conf.power_index)
+               return 0;
+
+       iwm->conf.power_index = power_index;
+
+       return iwm_umac_set_config_fix(iwm, UMAC_PARAM_TBL_CFG_FIX,
+                                      CFG_POWER_INDEX, iwm->conf.power_index);
+}
+
 static struct cfg80211_ops iwm_cfg80211_ops = {
        .change_virtual_intf = iwm_cfg80211_change_iface,
        .add_key = iwm_cfg80211_add_key,
        .get_key = iwm_cfg80211_get_key,
        .del_key = iwm_cfg80211_del_key,
        .set_default_key = iwm_cfg80211_set_default_key,
+       .get_station = iwm_cfg80211_get_station,
        .scan = iwm_cfg80211_scan,
        .set_wiphy_params = iwm_cfg80211_set_wiphy_params,
+       .connect = iwm_cfg80211_connect,
+       .disconnect = iwm_cfg80211_disconnect,
        .join_ibss = iwm_cfg80211_join_ibss,
        .leave_ibss = iwm_cfg80211_leave_ibss,
        .set_tx_power = iwm_cfg80211_set_txpower,
        .get_tx_power = iwm_cfg80211_get_txpower,
+       .set_power_mgmt = iwm_cfg80211_set_power_mgmt,
+};
+
+static const u32 cipher_suites[] = {
+       WLAN_CIPHER_SUITE_WEP40,
+       WLAN_CIPHER_SUITE_WEP104,
+       WLAN_CIPHER_SUITE_TKIP,
+       WLAN_CIPHER_SUITE_CCMP,
 };
 
 struct wireless_dev *iwm_wdev_alloc(int sizeof_bus, struct device *dev)
@@ -578,6 +789,9 @@ struct wireless_dev *iwm_wdev_alloc(int sizeof_bus, struct device *dev)
        wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &iwm_band_5ghz;
        wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
 
+       wdev->wiphy->cipher_suites = cipher_suites;
+       wdev->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
+
        ret = wiphy_register(wdev->wiphy);
        if (ret < 0) {
                dev_err(dev, "Couldn't register wiphy device\n");