summaryrefslogtreecommitdiffstats
path: root/net/wireless/nl80211.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-02 09:13:27 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:01:51 -0400
commit6829c878ecd24ff0ae41b4668c7e9d0f11b66942 (patch)
treeacf78b685d60694040953b4f61d768b95b79e45d /net/wireless/nl80211.c
parentb23aa676ab9d54469cda9f7151f51a2851c6f36e (diff)
downloadkernel-crypto-6829c878ecd24ff0ae41b4668c7e9d0f11b66942.tar.gz
kernel-crypto-6829c878ecd24ff0ae41b4668c7e9d0f11b66942.tar.xz
kernel-crypto-6829c878ecd24ff0ae41b4668c7e9d0f11b66942.zip
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/nl80211.c')
-rw-r--r--net/wireless/nl80211.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 89dd3793e03..89aa9e781d1 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -351,12 +351,12 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
#undef CMD
- if (dev->ops->connect) {
+ if (dev->ops->connect || dev->ops->auth) {
i++;
NLA_PUT_U32(msg, i, NL80211_CMD_CONNECT);
}
- if (dev->ops->disconnect) {
+ if (dev->ops->disconnect || dev->ops->deauth) {
i++;
NLA_PUT_U32(msg, i, NL80211_CMD_DISCONNECT);
}