cfg80211: connect/disconnect API
Samuel Ortiz [Wed, 1 Jul 2009 19:26:54 +0000 (21:26 +0200)]
This patch introduces the cfg80211 connect/disconnect API.
The goal here is to run the AUTH and ASSOC steps in one call.
This is needed for some fullmac cards that run both steps
directly from the target, after the host driver sends a
connect command.

Additionally, all the new crypto parameters for connect()
are now also valid for associate() -- although associate
requires the IEs to be used, the information can be useful
for drivers and should be given.

Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

include/linux/nl80211.h
include/net/cfg80211.h
net/mac80211/cfg.c
net/wireless/Makefile
net/wireless/core.c
net/wireless/core.h
net/wireless/nl80211.c
net/wireless/nl80211.h
net/wireless/sme.c [new file with mode: 0644]

index 651b188..b34c17f 100644 (file)
  *     to identify the device, and the TESTDATA blob attribute to pass through
  *     to the driver.
  *
+ * @NL80211_CMD_CONNECT: connection request and notification; this command
+ *     requests to connect to a specified network but without separating
+ *     auth and assoc steps. For this, you need to specify the SSID in a
+ *     %NL80211_ATTR_SSID attribute, and can optionally specify the association
+ *     IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_MAC,
+ *     %NL80211_ATTR_WIPHY_FREQ and %NL80211_ATTR_CONTROL_PORT.
+ *     It is also sent as an event, with the BSSID and response IEs when the
+ *     connection is established or failed to be established. This can be
+ *     determined by the STATUS_CODE attribute.
+ * @NL80211_CMD_ROAM: request that the card roam (currently not implemented),
+ *     sent as an event when the card/driver roamed by itself.
+ * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify
+ *     userspace that a connection was dropped by the AP or due to other
+ *     reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and
+ *     %NL80211_ATTR_REASON_CODE attributes are used.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -316,6 +332,10 @@ enum nl80211_commands {
 
        NL80211_CMD_TESTMODE,
 
+       NL80211_CMD_CONNECT,
+       NL80211_CMD_ROAM,
+       NL80211_CMD_DISCONNECT,
+
        /* add new commands above here */
 
        /* used to define NL80211_CMD_MAX below */
@@ -520,6 +540,30 @@ enum nl80211_commands {
  * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
  *     We recommend using nested, driver-specific attributes within this.
  *
+ * @NL80211_ATTR_DISCONNECTED_BY_AP: A flag indicating that the DISCONNECT
+ *     event was due to the AP disconnecting the station, and not due to
+ *     a local disconnect request.
+ * @NL80211_ATTR_STATUS_CODE: StatusCode for the %NL80211_CMD_CONNECT
+ *     event (u16)
+ * @NL80211_ATTR_PRIVACY: Flag attribute, used with connect(), indicating
+ *     that protected APs should be used.
+ *
+ * @NL80211_ATTR_CIPHERS_PAIRWISE: Used with CONNECT and ASSOCIATE to
+ *     indicate which unicast key ciphers will be used with the connection
+ *     (an array of u32).
+ * @NL80211_ATTR_CIPHER_GROUP: Used with CONNECT and ASSOCIATE to indicate
+ *     which group key cipher will be used with the connection (a u32).
+ * @NL80211_ATTR_WPA_VERSIONS: Used with CONNECT and ASSOCIATE to indicate
+ *     which WPA version(s) the AP we want to associate with is using
+ *     (a u32 with flags from &enum nl80211_wpa_versions).
+ * @NL80211_ATTR_AKM_SUITES: Used with CONNECT and ASSOCIATE to indicate
+ *     which key management algorithm(s) to use (an array of u32).
+ *
+ * @NL80211_ATTR_REQ_IE: (Re)association request information elements as
+ *     sent out by the card, for ROAM and successful CONNECT events.
+ * @NL80211_ATTR_RESP_IE: (Re)association response information elements as
+ *     sent by peer, for ROAM and successful CONNECT events.
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -630,6 +674,19 @@ enum nl80211_attrs {
 
        NL80211_ATTR_TESTDATA,
 
+       NL80211_ATTR_PRIVACY,
+
+       NL80211_ATTR_DISCONNECTED_BY_AP,
+       NL80211_ATTR_STATUS_CODE,
+
+       NL80211_ATTR_CIPHER_SUITES_PAIRWISE,
+       NL80211_ATTR_CIPHER_SUITE_GROUP,
+       NL80211_ATTR_WPA_VERSIONS,
+       NL80211_ATTR_AKM_SUITES,
+
+       NL80211_ATTR_REQ_IE,
+       NL80211_ATTR_RESP_IE,
+
        /* add attributes here, update the policy in nl80211.c */
 
        __NL80211_ATTR_AFTER_LAST,
@@ -640,6 +697,7 @@ enum nl80211_attrs {
  * Allow user space programs to use #ifdef on new attributes by defining them
  * here
  */
+#define NL80211_CMD_CONNECT NL80211_CMD_CONNECT
 #define NL80211_ATTR_HT_CAPABILITY NL80211_ATTR_HT_CAPABILITY
 #define NL80211_ATTR_BSS_BASIC_RATES NL80211_ATTR_BSS_BASIC_RATES
 #define NL80211_ATTR_WIPHY_TXQ_PARAMS NL80211_ATTR_WIPHY_TXQ_PARAMS
@@ -653,6 +711,10 @@ enum nl80211_attrs {
 #define NL80211_ATTR_SSID NL80211_ATTR_SSID
 #define NL80211_ATTR_AUTH_TYPE NL80211_ATTR_AUTH_TYPE
 #define NL80211_ATTR_REASON_CODE NL80211_ATTR_REASON_CODE
+#define NL80211_ATTR_CIPHER_SUITES_PAIRWISE NL80211_ATTR_CIPHER_SUITES_PAIRWISE
+#define NL80211_ATTR_CIPHER_SUITE_GROUP NL80211_ATTR_CIPHER_SUITE_GROUP
+#define NL80211_ATTR_WPA_VERSIONS NL80211_ATTR_WPA_VERSIONS
+#define NL80211_ATTR_AKM_SUITES NL80211_ATTR_AKM_SUITES
 
 #define NL80211_MAX_SUPP_RATES                 32
 #define NL80211_MAX_SUPP_REG_RULES             32
@@ -661,6 +723,9 @@ enum nl80211_attrs {
 #define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY    24
 #define NL80211_HT_CAPABILITY_LEN              26
 
+#define NL80211_MAX_NR_CIPHER_SUITES           5
+#define NL80211_MAX_NR_AKM_SUITES              2
+
 /**
  * enum nl80211_iftype - (virtual) interface types
  *
@@ -1205,12 +1270,22 @@ enum nl80211_bss {
  * @NL80211_AUTHTYPE_SHARED_KEY: Shared Key authentication (WEP only)
  * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)
  * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)
+ * @__NL80211_AUTHTYPE_NUM: internal
+ * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm
+ * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by
+ *     trying multiple times); this is invalid in netlink -- leave out
+ *     the attribute for this on CONNECT commands.
  */
 enum nl80211_auth_type {
        NL80211_AUTHTYPE_OPEN_SYSTEM,
        NL80211_AUTHTYPE_SHARED_KEY,
        NL80211_AUTHTYPE_FT,
        NL80211_AUTHTYPE_NETWORK_EAP,
+
+       /* keep last */
+       __NL80211_AUTHTYPE_NUM,
+       NL80211_AUTHTYPE_MAX = __NL80211_AUTHTYPE_NUM - 1,
+       NL80211_AUTHTYPE_AUTOMATIC
 };
 
 /**
@@ -1235,4 +1310,9 @@ enum nl80211_mfp {
        NL80211_MFP_REQUIRED,
 };
 
+enum nl80211_wpa_versions {
+       NL80211_WPA_VERSION_1 = 1 << 0,
+       NL80211_WPA_VERSION_2 = 1 << 1,
+};
+
 #endif /* __LINUX_NL80211_H */
index 885d4e5..68e1132 100644 (file)
@@ -605,6 +605,30 @@ struct cfg80211_bss {
 };
 
 /**
+ * struct cfg80211_crypto_settings - Crypto settings
+ * @wpa_versions: indicates which, if any, WPA versions are enabled
+ *     (from enum nl80211_wpa_versions)
+ * @cipher_group: group key cipher suite (or 0 if unset)
+ * @n_ciphers_pairwise: number of AP supported unicast ciphers
+ * @ciphers_pairwise: unicast key cipher suites
+ * @n_akm_suites: number of AKM suites
+ * @akm_suites: AKM suites
+ * @control_port: Whether user space controls IEEE 802.1X port, i.e.,
+ *     sets/clears %NL80211_STA_FLAG_AUTHORIZED. If true, the driver is
+ *     required to assume that the port is unauthorized until authorized by
+ *     user space. Otherwise, port is marked authorized by default.
+ */
+struct cfg80211_crypto_settings {
+       u32 wpa_versions;
+       u32 cipher_group;
+       int n_ciphers_pairwise;
+       u32 ciphers_pairwise[NL80211_MAX_NR_CIPHER_SUITES];
+       int n_akm_suites;
+       u32 akm_suites[NL80211_MAX_NR_AKM_SUITES];
+       bool control_port;
+};
+
+/**
  * struct cfg80211_auth_request - Authentication request data
  *
  * This structure provides information needed to complete IEEE 802.11
@@ -658,10 +682,7 @@ struct cfg80211_auth_request {
  * @ie: Extra IEs to add to (Re)Association Request frame or %NULL
  * @ie_len: Length of ie buffer in octets
  * @use_mfp: Use management frame protection (IEEE 802.11w) in this association
- * @control_port: Whether user space controls IEEE 802.1X port, i.e.,
- *     sets/clears %NL80211_STA_FLAG_AUTHORIZED. If true, the driver is
- *     required to assume that the port is unauthorized until authorized by
- *     user space. Otherwise, port is marked authorized by default.
+ * @crypto: crypto settings
  */
 struct cfg80211_assoc_request {
        struct ieee80211_channel *chan;
@@ -671,7 +692,7 @@ struct cfg80211_assoc_request {
        const u8 *ie;
        size_t ie_len;
        bool use_mfp;
-       bool control_port;
+       struct cfg80211_crypto_settings crypto;
 };
 
 /**
@@ -738,6 +759,36 @@ struct cfg80211_ibss_params {
 };
 
 /**
+ * struct cfg80211_connect_params - Connection parameters
+ *
+ * This structure provides information needed to complete IEEE 802.11
+ * authentication and association.
+ *
+ * @channel: The channel to use or %NULL if not specified (auto-select based
+ *     on scan results)
+ * @bssid: The AP BSSID or %NULL if not specified (auto-select based on scan
+ *     results)
+ * @ssid: SSID
+ * @ssid_len: Length of ssid in octets
+ * @auth_type: Authentication type (algorithm)
+ * @assoc_ie: IEs for association request
+ * @assoc_ie_len: Length of assoc_ie in octets
+ * @privacy: indicates whether privacy-enabled APs should be used
+ * @crypto: crypto settings
+ */
+struct cfg80211_connect_params {
+       struct ieee80211_channel *channel;
+       u8 *bssid;
+       u8 *ssid;
+       size_t ssid_len;
+       enum nl80211_auth_type auth_type;
+       u8 *ie;
+       size_t ie_len;
+       bool privacy;
+       struct cfg80211_crypto_settings crypto;
+};
+
+/**
  * enum wiphy_params_flags - set_wiphy_params bitfield values
  * WIPHY_PARAM_RETRY_SHORT: wiphy->retry_short has changed
  * WIPHY_PARAM_RETRY_LONG: wiphy->retry_long has changed
@@ -841,6 +892,12 @@ enum tx_power_setting {
  * @deauth: Request to deauthenticate from the specified peer
  * @disassoc: Request to disassociate from the specified peer
  *
+ * @connect: Connect to the ESS with the specified parameters. When connected,
+ *     call cfg80211_connect_result() with status code %WLAN_STATUS_SUCCESS.
+ *     If the connection fails for some reason, call cfg80211_connect_result()
+ *     with the status from the AP.
+ * @disconnect: Disconnect from the BSS/ESS.
+ *
  * @join_ibss: Join the specified IBSS (or create if necessary). Once done, call
  *     cfg80211_ibss_joined(), also call that function when changing BSSID due
  *     to a merge.
@@ -946,6 +1003,11 @@ struct cfg80211_ops {
        int     (*disassoc)(struct wiphy *wiphy, struct net_device *dev,
                            struct cfg80211_disassoc_request *req);
 
+       int     (*connect)(struct wiphy *wiphy, struct net_device *dev,
+                          struct cfg80211_connect_params *sme);
+       int     (*disconnect)(struct wiphy *wiphy, struct net_device *dev,
+                             u16 reason_code);
+
        int     (*join_ibss)(struct wiphy *wiphy, struct net_device *dev,
                             struct cfg80211_ibss_params *params);
        int     (*leave_ibss)(struct wiphy *wiphy, struct net_device *dev);
@@ -1174,10 +1236,15 @@ struct wireless_dev {
        struct list_head list;
        struct net_device *netdev;
 
-       /* currently used for IBSS - might be rearranged in the future */
+       /* currently used for IBSS and SME - might be rearranged later */
        struct cfg80211_bss *current_bss;
        u8 ssid[IEEE80211_MAX_SSID_LEN];
        u8 ssid_len;
+       enum {
+               CFG80211_SME_IDLE,
+               CFG80211_SME_CONNECTING, /* ->connect called */
+               CFG80211_SME_CONNECTED,
+       } sme_state;
 
 #ifdef CONFIG_WIRELESS_EXT
        /* wext data */
@@ -1788,4 +1855,60 @@ void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp);
 #define CFG80211_TESTMODE_CMD(cmd)
 #endif
 
+/**
+ * cfg80211_connect_result - notify cfg80211 of connection result
+ *
+ * @dev: network device
+ * @bssid: the BSSID of the AP
+ * @req_ie: association request IEs (maybe be %NULL)
+ * @req_ie_len: association request IEs length
+ * @resp_ie: association response IEs (may be %NULL)
+ * @resp_ie_len: assoc response IEs length
+ * @status: status code, 0 for successful connection, use
+ *     %WLAN_STATUS_UNSPECIFIED_FAILURE if your device cannot give you
+ *     the real status code for failures.
+ * @gfp: allocation flags
+ *
+ * It should be called by the underlying driver whenever connect() has
+ * succeeded.
+ */
+void cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
+                            const u8 *req_ie, size_t req_ie_len,
+                            const u8 *resp_ie, size_t resp_ie_len,
+                            u16 status, gfp_t gfp);
+
+/**
+ * cfg80211_roamed - notify cfg80211 of roaming
+ *
+ * @dev: network device
+ * @bssid: the BSSID of the new AP
+ * @req_ie: association request IEs (maybe be %NULL)
+ * @req_ie_len: association request IEs length
+ * @resp_ie: association response IEs (may be %NULL)
+ * @resp_ie_len: assoc response IEs length
+ * @gfp: allocation flags
+ *
+ * It should be called by the underlying driver whenever it roamed
+ * from one AP to another while connected.
+ */
+void cfg80211_roamed(struct net_device *dev, const u8 *bssid,
+                    const u8 *req_ie, size_t req_ie_len,
+                    const u8 *resp_ie, size_t resp_ie_len, gfp_t gfp);
+
+/**
+ * cfg80211_disconnected - notify cfg80211 that connection was dropped
+ *
+ * @dev: network device
+ * @ie: information elements of the deauth/disassoc frame (may be %NULL)
+ * @ie_len: length of IEs
+ * @reason: reason code for the disconnection, set it to 0 if unknown
+ * @gfp: allocation flags
+ *
+ * After it calls this function, the driver should enter an idle state
+ * and not try to connect to any AP any more.
+ */
+void cfg80211_disconnected(struct net_device *dev, u16 reason,
+                          u8 *ie, size_t ie_len, gfp_t gfp);
+
+
 #endif /* __NET_CFG80211_H */
index c34c1a4..03de402 100644 (file)
@@ -1262,7 +1262,7 @@ static int ieee80211_assoc(struct wiphy *wiphy, struct net_device *dev,
                sdata->u.mgd.flags &= ~IEEE80211_STA_MFP_ENABLED;
        }
 
-       if (req->control_port)
+       if (req->crypto.control_port)
                sdata->u.mgd.flags |= IEEE80211_STA_CONTROL_PORT;
        else
                sdata->u.mgd.flags &= ~IEEE80211_STA_CONTROL_PORT;
index f78c483..750c08e 100644 (file)
@@ -5,7 +5,7 @@ obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
 obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
 obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
 
-cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o
+cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o sme.o
 cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o
 cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o
 
index d41b741..314e00f 100644 (file)
@@ -546,6 +546,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
                                "symlink to netdev!\n");
                }
                wdev->netdev = dev;
+               wdev->sme_state = CFG80211_SME_IDLE;
 #ifdef CONFIG_WIRELESS_EXT
                wdev->wext.default_key = -1;
                wdev->wext.default_mgmt_key = -1;
@@ -553,11 +554,20 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
                mutex_unlock(&rdev->devlist_mtx);
                break;
        case NETDEV_GOING_DOWN:
-               if (wdev->iftype != NL80211_IFTYPE_ADHOC)
-                       break;
                if (!wdev->ssid_len)
                        break;
-               cfg80211_leave_ibss(rdev, dev, true);
+
+               switch (wdev->iftype) {
+               case NL80211_IFTYPE_ADHOC:
+                       cfg80211_leave_ibss(rdev, dev, true);
+                       break;
+               case NL80211_IFTYPE_STATION:
+                       cfg80211_disconnect(rdev, dev,
+                                           WLAN_REASON_DEAUTH_LEAVING);
+                       break;
+               default:
+                       break;
+               }
                break;
        case NETDEV_UP:
 #ifdef CONFIG_WIRELESS_EXT
index bc084b6..f93f96f 100644 (file)
@@ -174,6 +174,13 @@ void cfg80211_clear_ibss(struct net_device *dev, bool nowext);
 int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
                        struct net_device *dev, bool nowext);
 
+/* SME */
+int cfg80211_connect(struct cfg80211_registered_device *rdev,
+                    struct net_device *dev,
+                    struct cfg80211_connect_params *connect);
+int cfg80211_disconnect(struct cfg80211_registered_device *rdev,
+                       struct net_device *dev, u16 reason);
+
 /* internal helpers */
 int cfg80211_validate_key_settings(struct key_params *params, int key_idx,
                                   const u8 *mac_addr);
index bb8de26..89dd379 100644 (file)
@@ -128,6 +128,9 @@ static struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] __read_mostly = {
                .len = sizeof(struct nl80211_sta_flag_update),
        },
        [NL80211_ATTR_CONTROL_PORT] = { .type = NLA_FLAG },
+       [NL80211_ATTR_PRIVACY] = { .type = NLA_FLAG },
+       [NL80211_ATTR_CIPHER_SUITE_GROUP] = { .type = NLA_U32 },
+       [NL80211_ATTR_WPA_VERSIONS] = { .type = NLA_U32 },
 };
 
 /* IE validation */
@@ -347,6 +350,17 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
        CMD(join_ibss, JOIN_IBSS);
 
 #undef CMD
+
+       if (dev->ops->connect) {
+               i++;
+               NLA_PUT_U32(msg, i, NL80211_CMD_CONNECT);
+       }
+
+       if (dev->ops->disconnect) {
+               i++;
+               NLA_PUT_U32(msg, i, NL80211_CMD_DISCONNECT);
+       }
+
        nla_nest_end(msg, nl_cmds);
 
        return genlmsg_end(msg, hdr);
@@ -3001,12 +3015,31 @@ static int nl80211_dump_scan(struct sk_buff *skb,
 
 static bool nl80211_valid_auth_type(enum nl80211_auth_type auth_type)
 {
-       return auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM ||
-               auth_type == NL80211_AUTHTYPE_SHARED_KEY ||
-               auth_type == NL80211_AUTHTYPE_FT ||
-               auth_type == NL80211_AUTHTYPE_NETWORK_EAP;
+       return auth_type <= NL80211_AUTHTYPE_MAX;
+}
+
+static bool nl80211_valid_wpa_versions(u32 wpa_versions)
+{
+       return !(wpa_versions & ~(NL80211_WPA_VERSION_1 |
+                                 NL80211_WPA_VERSION_2));
+}
+
+static bool nl80211_valid_akm_suite(u32 akm)
+{
+       return akm == WLAN_AKM_SUITE_8021X ||
+               akm == WLAN_AKM_SUITE_PSK;
+}
+
+static bool nl80211_valid_cipher_suite(u32 cipher)
+{
+       return cipher == WLAN_CIPHER_SUITE_WEP40 ||
+               cipher == WLAN_CIPHER_SUITE_WEP104 ||
+               cipher == WLAN_CIPHER_SUITE_TKIP ||
+               cipher == WLAN_CIPHER_SUITE_CCMP ||
+               cipher == WLAN_CIPHER_SUITE_AES_CMAC;
 }
 
+
 static int nl80211_authenticate(struct sk_buff *skb, struct genl_info *info)
 {
        struct cfg80211_registered_device *drv;
@@ -3086,6 +3119,68 @@ unlock_rtnl:
        return err;
 }
 
+static int nl80211_crypto_settings(struct genl_info *info,
+                                  struct cfg80211_crypto_settings *settings)
+{
+       settings->control_port = info->attrs[NL80211_ATTR_CONTROL_PORT];
+
+       if (info->attrs[NL80211_ATTR_CIPHER_SUITES_PAIRWISE]) {
+               void *data;
+               int len, i;
+
+               data = nla_data(info->attrs[NL80211_ATTR_CIPHER_SUITES_PAIRWISE]);
+               len = nla_len(info->attrs[NL80211_ATTR_CIPHER_SUITES_PAIRWISE]);
+               settings->n_ciphers_pairwise = len / sizeof(u32);
+
+               if (len % sizeof(u32))
+                       return -EINVAL;
+
+               if (settings->n_ciphers_pairwise > NL80211_MAX_NR_CIPHER_SUITES)
+                       return -EINVAL;
+
+               memcpy(settings->ciphers_pairwise, data, len);
+
+               for (i = 0; i < settings->n_ciphers_pairwise; i++)
+                       if (!nl80211_valid_cipher_suite(
+                                       settings->ciphers_pairwise[i]))
+                               return -EINVAL;
+       }
+
+       if (info->attrs[NL80211_ATTR_CIPHER_SUITE_GROUP]) {
+               settings->cipher_group =
+                       nla_get_u32(info->attrs[NL80211_ATTR_CIPHER_SUITE_GROUP]);
+               if (!nl80211_valid_cipher_suite(settings->cipher_group))
+                       return -EINVAL;
+       }
+
+       if (info->attrs[NL80211_ATTR_WPA_VERSIONS]) {
+               settings->wpa_versions =
+                       nla_get_u32(info->attrs[NL80211_ATTR_WPA_VERSIONS]);
+               if (!nl80211_valid_wpa_versions(settings->wpa_versions))
+                       return -EINVAL;
+       }
+
+       if (info->attrs[NL80211_ATTR_AKM_SUITES]) {
+               void *data;
+               int len, i;
+
+               data = nla_data(info->attrs[NL80211_ATTR_AKM_SUITES]);
+               len = nla_len(info->attrs[NL80211_ATTR_AKM_SUITES]);
+               settings->n_akm_suites = len / sizeof(u32);
+
+               if (len % sizeof(u32))
+                       return -EINVAL;
+
+               memcpy(settings->akm_suites, data, len);
+
+               for (i = 0; i < settings->n_ciphers_pairwise; i++)
+                       if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
+                               return -EINVAL;
+       }
+
+       return 0;
+}
+
 static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
 {
        struct cfg80211_registered_device *drv;
@@ -3156,9 +3251,9 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
                }
        }
 
-       req.control_port = info->attrs[NL80211_ATTR_CONTROL_PORT];
-
-       err = drv->ops->assoc(&drv->wiphy, dev, &req);
+       err = nl80211_crypto_settings(info, &req.crypto);
+       if (!err)
+               err = drv->ops->assoc(&drv->wiphy, dev, &req);
 
 out:
        cfg80211_put_dev(drv);
@@ -3538,6 +3633,130 @@ void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)
 EXPORT_SYMBOL(cfg80211_testmode_event);
 #endif
 
+static int nl80211_connect(struct sk_buff *skb, struct genl_info *info)
+{
+       struct cfg80211_registered_device *drv;
+       struct net_device *dev;
+       struct cfg80211_connect_params connect;
+       struct wiphy *wiphy;
+       int err;
+
+       memset(&connect, 0, sizeof(connect));
+
+       if (!is_valid_ie_attr(info->attrs[NL80211_ATTR_IE]))
+               return -EINVAL;
+
+       if (!info->attrs[NL80211_ATTR_SSID] ||
+           !nla_len(info->attrs[NL80211_ATTR_SSID]))
+               return -EINVAL;
+
+       if (info->attrs[NL80211_ATTR_AUTH_TYPE]) {
+               connect.auth_type =
+                       nla_get_u32(info->attrs[NL80211_ATTR_AUTH_TYPE]);
+               if (!nl80211_valid_auth_type(connect.auth_type))
+                       return -EINVAL;
+       } else
+               connect.auth_type = NL80211_AUTHTYPE_AUTOMATIC;
+
+       connect.privacy = info->attrs[NL80211_ATTR_PRIVACY];
+
+       err = nl80211_crypto_settings(info, &connect.crypto);
+       if (err)
+               return err;
+       rtnl_lock();
+
+       err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
+       if (err)
+               goto unlock_rtnl;
+
+       if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {
+               err = -EOPNOTSUPP;
+               goto out;
+       }
+
+       if (!netif_running(dev)) {
+               err = -ENETDOWN;
+               goto out;
+       }
+
+       wiphy = &drv->wiphy;
+
+       connect.bssid = NULL;
+       connect.channel = NULL;
+       connect.auth_type = NL80211_AUTHTYPE_OPEN_SYSTEM;
+
+       if (info->attrs[NL80211_ATTR_MAC])
+               connect.bssid = nla_data(info->attrs[NL80211_ATTR_MAC]);
+       connect.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]);
+       connect.ssid_len = nla_len(info->attrs[NL80211_ATTR_SSID]);
+
+       if (info->attrs[NL80211_ATTR_IE]) {
+               connect.ie = nla_data(info->attrs[NL80211_ATTR_IE]);
+               connect.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
+       }
+
+       if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
+               connect.channel =
+                       ieee80211_get_channel(wiphy,
+                           nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]));
+               if (!connect.channel ||
+                   connect.channel->flags & IEEE80211_CHAN_DISABLED) {
+                       err = -EINVAL;
+                       goto out;
+               }
+       }
+
+       err = cfg80211_connect(drv, dev, &connect);
+
+out:
+       cfg80211_put_dev(drv);
+       dev_put(dev);
+unlock_rtnl:
+       rtnl_unlock();
+       return err;
+}
+
+static int nl80211_disconnect(struct sk_buff *skb, struct genl_info *info)
+{
+       struct cfg80211_registered_device *drv;
+       struct net_device *dev;
+       int err;
+       u16 reason;
+
+       if (!info->attrs[NL80211_ATTR_REASON_CODE])
+               reason = WLAN_REASON_DEAUTH_LEAVING;
+       else
+               reason = nla_get_u16(info->attrs[NL80211_ATTR_REASON_CODE]);
+
+       if (reason == 0)
+               return -EINVAL;
+
+       rtnl_lock();
+
+       err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
+       if (err)
+               goto unlock_rtnl;
+
+       if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {
+               err = -EOPNOTSUPP;
+               goto out;
+       }
+
+       if (!netif_running(dev)) {
+               err = -ENETDOWN;
+               goto out;
+       }
+
+       err = cfg80211_disconnect(drv, dev, reason);
+
+out:
+       cfg80211_put_dev(drv);
+       dev_put(dev);
+unlock_rtnl:
+       rtnl_unlock();
+       return err;
+}
+
 static struct genl_ops nl80211_ops[] = {
        {
                .cmd = NL80211_CMD_GET_WIPHY,
@@ -3759,6 +3978,18 @@ static struct genl_ops nl80211_ops[] = {
                .flags = GENL_ADMIN_PERM,
        },
 #endif
+       {
+               .cmd = NL80211_CMD_CONNECT,
+               .doit = nl80211_connect,
+               .policy = nl80211_policy,
+               .flags = GENL_ADMIN_PERM,
+       },
+       {
+               .cmd = NL80211_CMD_DISCONNECT,
+               .doit = nl80211_disconnect,
+               .policy = nl80211_policy,
+               .flags = GENL_ADMIN_PERM,
+       },
 };
 static struct genl_multicast_group nl80211_mlme_mcgrp = {
        .name = "mlme",
@@ -4077,6 +4308,129 @@ void nl80211_send_assoc_timeout(struct cfg80211_registered_device *rdev,
                                  addr, gfp);
 }
 
+void nl80211_send_connect_result(struct cfg80211_registered_device *rdev,
+                                struct net_device *netdev, const u8 *bssid,
+                                const u8 *req_ie, size_t req_ie_len,
+                                const u8 *resp_ie, size_t resp_ie_len,
+                                u16 status, gfp_t gfp)
+{
+       struct sk_buff *msg;
+       void *hdr;
+
+       msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+       if (!msg)
+               return;
+
+       hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_CONNECT);
+       if (!hdr) {
+               nlmsg_free(msg);
+               return;
+       }
+
+       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx);
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex);
+       if (bssid)
+               NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, bssid);
+       NLA_PUT_U16(msg, NL80211_ATTR_STATUS_CODE, status);
+       if (req_ie)
+               NLA_PUT(msg, NL80211_ATTR_REQ_IE, req_ie_len, req_ie);
+       if (resp_ie)
+               NLA_PUT(msg, NL80211_ATTR_RESP_IE, resp_ie_len, resp_ie);
+
+       if (genlmsg_end(msg, hdr) < 0) {
+               nlmsg_free(msg);
+               return;
+       }
+
+       genlmsg_multicast(msg, 0, nl80211_mlme_mcgrp.id, gfp);
+       return;
+
+ nla_put_failure:
+       genlmsg_cancel(msg, hdr);
+       nlmsg_free(msg);
+
+}
+
+void nl80211_send_roamed(struct cfg80211_registered_device *rdev,
+                        struct net_device *netdev, const u8 *bssid,
+                        const u8 *req_ie, size_t req_ie_len,
+                        const u8 *resp_ie, size_t resp_ie_len, gfp_t gfp)
+{
+       struct sk_buff *msg;
+       void *hdr;
+
+       msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+       if (!msg)
+               return;
+
+       hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_ROAM);
+       if (!hdr) {
+               nlmsg_free(msg);
+               return;
+       }
+
+       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx);
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex);
+       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, bssid);
+       if (req_ie)
+               NLA_PUT(msg, NL80211_ATTR_REQ_IE, req_ie_len, req_ie);
+       if (resp_ie)
+               NLA_PUT(msg, NL80211_ATTR_RESP_IE, resp_ie_len, resp_ie);
+
+       if (genlmsg_end(msg, hdr) < 0) {
+               nlmsg_free(msg);
+               return;
+       }
+
+       genlmsg_multicast(msg, 0, nl80211_mlme_mcgrp.id, gfp);
+       return;
+
+ nla_put_failure:
+       genlmsg_cancel(msg, hdr);
+       nlmsg_free(msg);
+
+}
+
+void nl80211_send_disconnected(struct cfg80211_registered_device *rdev,
+                              struct net_device *netdev, u16 reason,
+                              u8 *ie, size_t ie_len, bool from_ap, gfp_t gfp)
+{
+       struct sk_buff *msg;
+       void *hdr;
+
+       msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+       if (!msg)
+               return;
+
+       hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_DISCONNECT);
+       if (!hdr) {
+               nlmsg_free(msg);
+               return;
+       }
+
+       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx);
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex);
+       if (from_ap && reason)
+               NLA_PUT_U16(msg, NL80211_ATTR_REASON_CODE, reason);
+       if (from_ap)
+               NLA_PUT_FLAG(msg, NL80211_ATTR_DISCONNECTED_BY_AP);
+       if (ie)
+               NLA_PUT(msg, NL80211_ATTR_IE, ie_len, ie);
+
+       if (genlmsg_end(msg, hdr) < 0) {
+               nlmsg_free(msg);
+               return;
+       }
+
+       genlmsg_multicast(msg, 0, nl80211_mlme_mcgrp.id, gfp);
+       return;
+
+ nla_put_failure:
+       genlmsg_cancel(msg, hdr);
+       nlmsg_free(msg);
+
+}
+
 void nl80211_send_ibss_bssid(struct cfg80211_registered_device *rdev,
                             struct net_device *netdev, const u8 *bssid,
                             gfp_t gfp)
index 662c216..cf3708b 100644 (file)
@@ -31,6 +31,19 @@ void nl80211_send_auth_timeout(struct cfg80211_registered_device *rdev,
 void nl80211_send_assoc_timeout(struct cfg80211_registered_device *rdev,
                                struct net_device *netdev,
                                const u8 *addr, gfp_t gfp);
+void nl80211_send_connect_result(struct cfg80211_registered_device *rdev,
+                                struct net_device *netdev, const u8 *bssid,
+                                const u8 *req_ie, size_t req_ie_len,
+                                const u8 *resp_ie, size_t resp_ie_len,
+                                u16 status, gfp_t gfp);
+void nl80211_send_roamed(struct cfg80211_registered_device *rdev,
+                        struct net_device *netdev, const u8 *bssid,
+                        const u8 *req_ie, size_t req_ie_len,
+                        const u8 *resp_ie, size_t resp_ie_len, gfp_t gfp);
+void nl80211_send_disconnected(struct cfg80211_registered_device *rdev,
+                              struct net_device *netdev, u16 reason,
+                              u8 *ie, size_t ie_len, bool from_ap, gfp_t gfp);
+
 void
 nl80211_michael_mic_failure(struct cfg80211_registered_device *rdev,
                            struct net_device *netdev, const u8 *addr,
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
new file mode 100644 (file)
index 0000000..fc11703
--- /dev/null
@@ -0,0 +1,224 @@
+/*
+ * SME code for cfg80211's connect emulation.
+ *
+ * Copyright 2009      Johannes Berg <johannes@sipsolutions.net>
+ * Copyright (C) 2009   Intel Corporation. All rights reserved.
+ */
+
+#include <linux/etherdevice.h>
+#include <linux/if_arp.h>
+#include <linux/workqueue.h>
+#include <net/cfg80211.h>
+#include <net/rtnetlink.h>
+#include "nl80211.h"
+
+
+void cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
+                            const u8 *req_ie, size_t req_ie_len,
+                            const u8 *resp_ie, size_t resp_ie_len,
+                            u16 status, gfp_t gfp)
+{
+       struct wireless_dev *wdev = dev->ieee80211_ptr;
+       struct cfg80211_bss *bss;
+#ifdef CONFIG_WIRELESS_EXT
+       union iwreq_data wrqu;
+#endif
+
+       if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))
+               return;
+
+       if (WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTING))
+               return;
+
+       if (wdev->current_bss) {
+               cfg80211_unhold_bss(wdev->current_bss);
+               cfg80211_put_bss(wdev->current_bss);
+               wdev->current_bss = NULL;
+       }
+
+       if (status == WLAN_STATUS_SUCCESS) {
+               bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
+                                      wdev->ssid, wdev->ssid_len,
+                                      WLAN_CAPABILITY_ESS,
+                                      WLAN_CAPABILITY_ESS);
+
+               if (WARN_ON(!bss))
+                       return;
+
+               cfg80211_hold_bss(bss);
+               wdev->current_bss = bss;
+
+               wdev->sme_state = CFG80211_SME_CONNECTED;
+       } else {
+               wdev->sme_state = CFG80211_SME_IDLE;
+       }
+
+       nl80211_send_connect_result(wiphy_to_dev(wdev->wiphy), dev, bssid,
+                                   req_ie, req_ie_len, resp_ie, resp_ie_len,
+                                   status, gfp);
+
+#ifdef CONFIG_WIRELESS_EXT
+       if (req_ie && status == WLAN_STATUS_SUCCESS) {
+               memset(&wrqu, 0, sizeof(wrqu));
+               wrqu.data.length = req_ie_len;
+               wireless_send_event(dev, IWEVASSOCRESPIE, &wrqu, req_ie);
+       }
+
+       if (resp_ie && status == WLAN_STATUS_SUCCESS) {
+               memset(&wrqu, 0, sizeof(wrqu));
+               wrqu.data.length = resp_ie_len;
+               wireless_send_event(dev, IWEVASSOCRESPIE, &wrqu, resp_ie);
+       }
+
+       memset(&wrqu, 0, sizeof(wrqu));
+       wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+       if (bssid)
+               memcpy(wrqu.ap_addr.sa_data, bssid, ETH_ALEN);
+       wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
+#endif
+}
+EXPORT_SYMBOL(cfg80211_connect_result);
+
+void cfg80211_roamed(struct net_device *dev, const u8 *bssid,
+                    const u8 *req_ie, size_t req_ie_len,
+                    const u8 *resp_ie, size_t resp_ie_len, gfp_t gfp)
+{
+       struct wireless_dev *wdev = dev->ieee80211_ptr;
+       struct cfg80211_bss *bss;
+#ifdef CONFIG_WIRELESS_EXT
+       union iwreq_data wrqu;
+#endif
+
+       if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))
+               return;
+
+       if (WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTED))
+               return;
+
+       /* internal error -- how did we get to CONNECTED w/o BSS? */
+       if (WARN_ON(!wdev->current_bss)) {
+               return;
+       }
+
+       cfg80211_unhold_bss(wdev->current_bss);
+       cfg80211_put_bss(wdev->current_bss);
+       wdev->current_bss = NULL;
+
+       bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
+                              wdev->ssid, wdev->ssid_len,
+                              WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
+
+       if (WARN_ON(!bss))
+               return;
+
+       cfg80211_hold_bss(bss);
+       wdev->current_bss = bss;
+
+       nl80211_send_roamed(wiphy_to_dev(wdev->wiphy), dev, bssid,
+                           req_ie, req_ie_len, resp_ie, resp_ie_len, gfp);
+
+#ifdef CONFIG_WIRELESS_EXT
+       if (req_ie) {
+               memset(&wrqu, 0, sizeof(wrqu));
+               wrqu.data.length = req_ie_len;
+               wireless_send_event(dev, IWEVASSOCRESPIE, &wrqu, req_ie);
+       }
+
+       if (resp_ie) {
+               memset(&wrqu, 0, sizeof(wrqu));
+               wrqu.data.length = resp_ie_len;
+               wireless_send_event(dev, IWEVASSOCRESPIE, &wrqu, resp_ie);
+       }
+
+       memset(&wrqu, 0, sizeof(wrqu));
+       wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+       memcpy(wrqu.ap_addr.sa_data, bssid, ETH_ALEN);
+       wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
+#endif
+}
+EXPORT_SYMBOL(cfg80211_roamed);
+
+static void __cfg80211_disconnected(struct net_device *dev, gfp_t gfp,
+                                   u8 *ie, size_t ie_len, u16 reason,
+                                   bool from_ap)
+{
+       struct wireless_dev *wdev = dev->ieee80211_ptr;
+#ifdef CONFIG_WIRELESS_EXT
+       union iwreq_data wrqu;
+#endif
+
+       if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))
+               return;
+
+       if (WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTED))
+               return;
+
+       if (wdev->current_bss) {
+               cfg80211_unhold_bss(wdev->current_bss);
+               cfg80211_put_bss(wdev->current_bss);
+       }
+
+       wdev->current_bss = NULL;
+       wdev->sme_state = CFG80211_SME_IDLE;
+
+       nl80211_send_disconnected(wiphy_to_dev(wdev->wiphy), dev,
+                                 reason, ie, ie_len, from_ap, gfp);
+
+#ifdef CONFIG_WIRELESS_EXT
+       memset(&wrqu, 0, sizeof(wrqu));
+       wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+       wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
+#endif
+}
+
+void cfg80211_disconnected(struct net_device *dev, u16 reason,
+                          u8 *ie, size_t ie_len, gfp_t gfp)
+{
+       __cfg80211_disconnected(dev, reason, ie, ie_len, true, gfp);
+}
+EXPORT_SYMBOL(cfg80211_disconnected);
+
+int cfg80211_connect(struct cfg80211_registered_device *rdev,
+                    struct net_device *dev,
+                    struct cfg80211_connect_params *connect)
+{
+       int err;
+       struct wireless_dev *wdev = dev->ieee80211_ptr;
+
+       if (wdev->sme_state != CFG80211_SME_IDLE)
+               return -EALREADY;
+
+       if (!rdev->ops->connect) {
+               return -EOPNOTSUPP;
+       } else {
+               wdev->sme_state = CFG80211_SME_CONNECTING;
+               err = rdev->ops->connect(&rdev->wiphy, dev, connect);
+               if (err) {
+                       wdev->sme_state = CFG80211_SME_IDLE;
+                       return err;
+               }
+       }
+
+       memcpy(wdev->ssid, connect->ssid, connect->ssid_len);
+       wdev->ssid_len = connect->ssid_len;
+
+       return 0;
+}
+
+int cfg80211_disconnect(struct cfg80211_registered_device *rdev,
+                       struct net_device *dev, u16 reason)
+{
+       int err;
+
+       if (!rdev->ops->disconnect) {
+               return -EOPNOTSUPP;
+       } else {
+               err = rdev->ops->disconnect(&rdev->wiphy, dev, reason);
+               if (err)
+                       return err;
+       }
+
+       __cfg80211_disconnected(dev, 0, NULL, 0, false, GFP_KERNEL);
+
+       return 0;
+}