cfg80211: implement IWAP for WDS

This implements siocsiwap/giwap for WDS mode.

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

2 files changed, 15 insertions, 22 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 8c7b2cdbeeda..2cf5bf6378e4 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1369,6 +1369,16 @@ static int ieee80211_get_tx_power(struct wiphy *wiphy, int *dbm)
         return 0;
 }
 
+static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
+                                  u8 *addr)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        memcpy(&sdata->u.wds.remote_addr, addr, ETH_ALEN);
+
+        return 0;
+}
+
 static void ieee80211_rfkill_poll(struct wiphy *wiphy)
 {
         struct ieee80211_local *local = wiphy_priv(wiphy);
@@ -1454,6 +1464,7 @@ struct cfg80211_ops mac80211_config_ops = {
         .set_wiphy_params = ieee80211_set_wiphy_params,
         .set_tx_power = ieee80211_set_tx_power,
         .get_tx_power = ieee80211_get_tx_power,
+        .set_wds_peer = ieee80211_set_wds_peer,
         .rfkill_poll = ieee80211_rfkill_poll,
         CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
         .set_power_mgmt = ieee80211_set_power_mgmt,
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index f77929802c7a..4053d766af2d 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -140,23 +140,8 @@ static int ieee80211_ioctl_siwap(struct net_device *dev,
         if (sdata->vif.type == NL80211_IFTYPE_STATION)
                 return cfg80211_mgd_wext_siwap(dev, info, ap_addr, extra);
 
-        if (sdata->vif.type == NL80211_IFTYPE_WDS) {
-                /*
-                 * If it is necessary to update the WDS peer address
-                 * while the interface is running, then we need to do
-                 * more work here, namely if it is running we need to
-                 * add a new and remove the old STA entry, this is
-                 * normally handled by _open() and _stop().
-                 */
-                if (netif_running(dev))
-                        return -EBUSY;
-
-                memcpy(&sdata->u.wds.remote_addr, (u8 *) &ap_addr->sa_data,
-                       ETH_ALEN);
-
-                return 0;
-        }
-
+        if (sdata->vif.type == NL80211_IFTYPE_WDS)
+                return cfg80211_wds_wext_siwap(dev, info, ap_addr, extra);
         return -EOPNOTSUPP;
 }
 
@@ -173,11 +158,8 @@ static int ieee80211_ioctl_giwap(struct net_device *dev,
         if (sdata->vif.type == NL80211_IFTYPE_STATION)
                 return cfg80211_mgd_wext_giwap(dev, info, ap_addr, extra);
 
-        if (sdata->vif.type == NL80211_IFTYPE_WDS) {
-                ap_addr->sa_family = ARPHRD_ETHER;
-                memcpy(&ap_addr->sa_data, sdata->u.wds.remote_addr, ETH_ALEN);
-                return 0;
-        }
+        if (sdata->vif.type == NL80211_IFTYPE_WDS)
+                return cfg80211_wds_wext_giwap(dev, info, ap_addr, extra);
 
         return -EOPNOTSUPP;
 }