[PATCH] softmac: add SIOCSIWMLME

This patch adds the SIOCSIWMLME wext to softmac, this functionality
appears to be used by wpa_supplicant and is softmac-specific.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Jouni Malinen <jkm@devicescape.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/net/ieee80211softmac_wx.h b/include/net/ieee80211softmac_wx.h
index 3e0be453ecea66020eb20a47681f3988f53caa9b..4ee3ad57283fa3370bd2d1f71cd6ae559b556dbc 100644 (file)
--- a/include/net/ieee80211softmac_wx.h
+++ b/include/net/ieee80211softmac_wx.h
@@ -91,4 +91,9 @@ ieee80211softmac_wx_get_genie(struct net_device *dev,
                              struct iw_request_info *info,
                              union iwreq_data *wrqu,
                              char *extra);
+extern int
+ieee80211softmac_wx_set_mlme(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu,
+                            char *extra);
 #endif /* _IEEE80211SOFTMAC_WX */

diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index fb79ce7d6439722df5afe7aa630e97868acc00d5..ea9f5aacce85fc4547eba87b5c1e1b8e68130b29 100644 (file)
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -82,7 +82,7 @@ ieee80211softmac_assoc_timeout(void *d)
 }
 
 /* Sends out a disassociation request to the desired AP */
-static void
+void
 ieee80211softmac_disassoc(struct ieee80211softmac_device *mac, u16 reason)
 {
        unsigned long flags;

diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h b/net/ieee80211/softmac/ieee80211softmac_priv.h
index 65d9816c8ecc0569ca63085c2753e5e1e954c014..8c95b3abe0cc5120eb856872ed7f7a8a460977ca 100644 (file)
--- a/net/ieee80211/softmac/ieee80211softmac_priv.h
+++ b/net/ieee80211/softmac/ieee80211softmac_priv.h
@@ -150,6 +150,7 @@ int ieee80211softmac_handle_disassoc(struct net_device * dev,
 int ieee80211softmac_handle_reassoc_req(struct net_device * dev,
                                        struct ieee80211_reassoc_request * reassoc);
 void ieee80211softmac_assoc_timeout(void *d);
+void ieee80211softmac_disassoc(struct ieee80211softmac_device *mac, u16 reason);
 
 /* some helper functions */
 static inline int ieee80211softmac_scan_handlers_check_self(struct ieee80211softmac_device *sm)

diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
index 27edb2b5581ab535ffd7f79c5b257dcaa5d36324..8d0c22641ca8886f5a65e8fcaa8e04aee7be045f 100644 (file)
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -431,3 +431,35 @@ ieee80211softmac_wx_get_genie(struct net_device *dev,
 }
 EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_genie);
 
+int
+ieee80211softmac_wx_set_mlme(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu,
+                            char *extra)
+{
+       struct ieee80211softmac_device *mac = ieee80211_priv(dev);
+       struct iw_mlme *mlme = (struct iw_mlme *)extra;
+       u16 reason = cpu_to_le16(mlme->reason_code);
+       struct ieee80211softmac_network *net;
+
+       if (memcmp(mac->associnfo.bssid, mlme->addr.sa_data, ETH_ALEN)) {
+               printk(KERN_DEBUG PFX "wx_set_mlme: requested operation on net we don't use\n");
+               return -EINVAL;
+       }
+
+       switch (mlme->cmd) {
+       case IW_MLME_DEAUTH:
+               net = ieee80211softmac_get_network_by_bssid_locked(mac, mlme->addr.sa_data);
+               if (!net) {
+                       printk(KERN_DEBUG PFX "wx_set_mlme: we should know the net here...\n");
+                       return -EINVAL;
+               }
+               return ieee80211softmac_deauth_req(mac, net, reason);
+       case IW_MLME_DISASSOC:
+               ieee80211softmac_disassoc(mac, reason);
+               return 0;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_mlme);