diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-07-02 03:13:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 15:01:51 -0400 |
commit | 6829c878ecd24ff0ae41b4668c7e9d0f11b66942 (patch) | |
tree | acf78b685d60694040953b4f61d768b95b79e45d /net/wireless/core.h | |
parent | b23aa676ab9d54469cda9f7151f51a2851c6f36e (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 'net/wireless/core.h')
-rw-r--r-- | net/wireless/core.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index f93f96f85d2..2c0f64252f3 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h | |||
@@ -62,6 +62,8 @@ struct cfg80211_registered_device { | |||
62 | struct genl_info *testmode_info; | 62 | struct genl_info *testmode_info; |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | struct work_struct conn_work; | ||
66 | |||
65 | #ifdef CONFIG_CFG80211_DEBUGFS | 67 | #ifdef CONFIG_CFG80211_DEBUGFS |
66 | /* Debugfs entries */ | 68 | /* Debugfs entries */ |
67 | struct wiphy_debugfsdentries { | 69 | struct wiphy_debugfsdentries { |
@@ -181,8 +183,14 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev, | |||
181 | int cfg80211_disconnect(struct cfg80211_registered_device *rdev, | 183 | int cfg80211_disconnect(struct cfg80211_registered_device *rdev, |
182 | struct net_device *dev, u16 reason); | 184 | struct net_device *dev, u16 reason); |
183 | 185 | ||
186 | void cfg80211_conn_work(struct work_struct *work); | ||
187 | |||
184 | /* internal helpers */ | 188 | /* internal helpers */ |
185 | int cfg80211_validate_key_settings(struct key_params *params, int key_idx, | 189 | int cfg80211_validate_key_settings(struct key_params *params, int key_idx, |
186 | const u8 *mac_addr); | 190 | const u8 *mac_addr); |
191 | void __cfg80211_disconnected(struct net_device *dev, gfp_t gfp, u8 *ie, | ||
192 | size_t ie_len, u16 reason, bool from_ap); | ||
193 | void cfg80211_sme_scan_done(struct net_device *dev); | ||
194 | void cfg80211_sme_rx_auth(struct net_device *dev, const u8 *buf, size_t len); | ||
187 | 195 | ||
188 | #endif /* __NET_WIRELESS_CORE_H */ | 196 | #endif /* __NET_WIRELESS_CORE_H */ |