aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-02 03:13:27 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:01:51 -0400
commit6829c878ecd24ff0ae41b4668c7e9d0f11b66942 (patch)
treeacf78b685d60694040953b4f61d768b95b79e45d /include/net
parentb23aa676ab9d54469cda9f7151f51a2851c6f36e (diff)
cfg80211: emulate connect with auth/assoc
This adds code to cfg80211 so that drivers (mac80211 right now) that don't implement connect but rather auth/assoc can still be used with the nl80211 connect command. This will also be necessary for the wext compat code. 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>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/cfg80211.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 68e11321ed74..24fab439d415 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1209,6 +1209,9 @@ extern void wiphy_unregister(struct wiphy *wiphy);
1209 */ 1209 */
1210extern void wiphy_free(struct wiphy *wiphy); 1210extern void wiphy_free(struct wiphy *wiphy);
1211 1211
1212/* internal struct */
1213struct cfg80211_conn;
1214
1212/** 1215/**
1213 * struct wireless_dev - wireless per-netdev state 1216 * struct wireless_dev - wireless per-netdev state
1214 * 1217 *
@@ -1242,9 +1245,10 @@ struct wireless_dev {
1242 u8 ssid_len; 1245 u8 ssid_len;
1243 enum { 1246 enum {
1244 CFG80211_SME_IDLE, 1247 CFG80211_SME_IDLE,
1245 CFG80211_SME_CONNECTING, /* ->connect called */ 1248 CFG80211_SME_CONNECTING,
1246 CFG80211_SME_CONNECTED, 1249 CFG80211_SME_CONNECTED,
1247 } sme_state; 1250 } sme_state;
1251 struct cfg80211_conn *conn;
1248 1252
1249#ifdef CONFIG_WIRELESS_EXT 1253#ifdef CONFIG_WIRELESS_EXT
1250 /* wext data */ 1254 /* wext data */