cfg80211: combine IWAP handlers

Since we now have IWAP handlers for all modes, we can
combine them into one.

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

1 files changed, 2 insertions, 32 deletions

diff --git a/drivers/net/wireless/iwmc3200wifi/wext.c b/drivers/net/wireless/iwmc3200wifi/wext.c
index 8058e9991c30..5319b16474e3 100644
--- a/drivers/net/wireless/iwmc3200wifi/wext.c
+++ b/drivers/net/wireless/iwmc3200wifi/wext.c
@@ -27,36 +27,6 @@
 #include "iwm.h"
 #include "commands.h"
 
-static int iwm_wext_siwap(struct net_device *dev, struct iw_request_info *info,
-                          struct sockaddr *ap_addr, char *extra)
-{
-        struct iwm_priv *iwm = ndev_to_iwm(dev);
-
-        switch (iwm->conf.mode) {
-        case UMAC_MODE_IBSS:
-                return cfg80211_ibss_wext_siwap(dev, info, ap_addr, extra);
-        case UMAC_MODE_BSS:
-                return cfg80211_mgd_wext_siwap(dev, info, ap_addr, extra);
-        default:
-                return -EOPNOTSUPP;
-        }
-}
-
-static int iwm_wext_giwap(struct net_device *dev, struct iw_request_info *info,
-                          struct sockaddr *ap_addr, char *extra)
-{
-        struct iwm_priv *iwm = ndev_to_iwm(dev);
-
-        switch (iwm->conf.mode) {
-        case UMAC_MODE_IBSS:
-                return cfg80211_ibss_wext_giwap(dev, info, ap_addr, extra);
-        case UMAC_MODE_BSS:
-                return cfg80211_mgd_wext_giwap(dev, info, ap_addr, extra);
-        default:
-                return -EOPNOTSUPP;
-        }
-}
-
 static int iwm_wext_siwessid(struct net_device *dev,
                              struct iw_request_info *info,
                              struct iw_point *data, char *ssid)
@@ -111,8 +81,8 @@ static const iw_handler iwm_handlers[] =
         (iw_handler) NULL,                              /* SIOCGIWSPY */
         (iw_handler) NULL,                              /* SIOCSIWTHRSPY */
         (iw_handler) NULL,                              /* SIOCGIWTHRSPY */
-        (iw_handler) iwm_wext_siwap,                    /* SIOCSIWAP */
-        (iw_handler) iwm_wext_giwap,                    /* SIOCGIWAP */
+        (iw_handler) cfg80211_wext_siwap,               /* SIOCSIWAP */
+        (iw_handler) cfg80211_wext_giwap,               /* SIOCGIWAP */
         (iw_handler) NULL,                              /* SIOCSIWMLME */
         (iw_handler) NULL,                              /* SIOCGIWAPLIST */
         (iw_handler) cfg80211_wext_siwscan,             /* SIOCSIWSCAN */