1 files changed, 341 insertions, 59 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 22c9619ba776..6b183a3526b0 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -15,6 +15,7 @@
 #include "ieee80211_i.h"
 #include "cfg.h"
 #include "ieee80211_rate.h"
+#include "mesh.h"
 
 static enum ieee80211_if_types
 nl80211_type_to_mac80211_type(enum nl80211_iftype type)
@@ -28,16 +29,24 @@ nl80211_type_to_mac80211_type(enum nl80211_iftype type)
                 return IEEE80211_IF_TYPE_STA;
         case NL80211_IFTYPE_MONITOR:
                 return IEEE80211_IF_TYPE_MNTR;
+#ifdef CONFIG_MAC80211_MESH
+        case NL80211_IFTYPE_MESH_POINT:
+                return IEEE80211_IF_TYPE_MESH_POINT;
+#endif
         default:
                 return IEEE80211_IF_TYPE_INVALID;
         }
 }
 
 static int ieee80211_add_iface(struct wiphy *wiphy, char *name,
-                               enum nl80211_iftype type)
+                               enum nl80211_iftype type, u32 *flags,
+                               struct vif_params *params)
 {
         struct ieee80211_local *local = wiphy_priv(wiphy);
         enum ieee80211_if_types itype;
+        struct net_device *dev;
+        struct ieee80211_sub_if_data *sdata;
+        int err;
 
         if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED))
                 return -ENODEV;
@@ -46,7 +55,13 @@ static int ieee80211_add_iface(struct wiphy *wiphy, char *name,
         if (itype == IEEE80211_IF_TYPE_INVALID)
                 return -EINVAL;
 
-        return ieee80211_if_add(local->mdev, name, NULL, itype);
+        err = ieee80211_if_add(local->mdev, name, &dev, itype, params);
+        if (err || itype != IEEE80211_IF_TYPE_MNTR || !flags)
+                return err;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        sdata->u.mntr_flags = *flags;
+        return 0;
 }
 
 static int ieee80211_del_iface(struct wiphy *wiphy, int ifindex)
@@ -69,7 +84,8 @@ static int ieee80211_del_iface(struct wiphy *wiphy, int ifindex)
 }
 
 static int ieee80211_change_iface(struct wiphy *wiphy, int ifindex,
-                                  enum nl80211_iftype type)
+                                  enum nl80211_iftype type, u32 *flags,
+                                  struct vif_params *params)
 {
         struct ieee80211_local *local = wiphy_priv(wiphy);
         struct net_device *dev;
@@ -99,6 +115,15 @@ static int ieee80211_change_iface(struct wiphy *wiphy, int ifindex,
         ieee80211_if_reinit(dev);
         ieee80211_if_set_type(dev, itype);
 
+        if (ieee80211_vif_is_mesh(&sdata->vif) && params->mesh_id_len)
+                ieee80211_if_sta_set_mesh_id(&sdata->u.sta,
+                                             params->mesh_id_len,
+                                             params->mesh_id);
+
+        if (sdata->vif.type != IEEE80211_IF_TYPE_MNTR || !flags)
+                return 0;
+
+        sdata->u.mntr_flags = *flags;
         return 0;
 }
 
@@ -109,7 +134,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
         struct ieee80211_sub_if_data *sdata;
         struct sta_info *sta = NULL;
         enum ieee80211_key_alg alg;
-        int ret;
+        struct ieee80211_key *key;
 
         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
@@ -128,21 +153,21 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
                 return -EINVAL;
         }
 
+        key = ieee80211_key_alloc(alg, key_idx, params->key_len, params->key);
+        if (!key)
+                return -ENOMEM;
+
         if (mac_addr) {
                 sta = sta_info_get(sdata->local, mac_addr);
-                if (!sta)
+                if (!sta) {
+                        ieee80211_key_free(key);
                         return -ENOENT;
+                }
         }
 
-        ret = 0;
-        if (!ieee80211_key_alloc(sdata, sta, alg, key_idx,
-                                 params->key_len, params->key))
-                ret = -ENOMEM;
-
-        if (sta)
-                sta_info_put(sta);
+        ieee80211_key_link(key, sdata, sta);
 
-        return ret;
+        return 0;
 }
 
 static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,
@@ -160,12 +185,12 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,
                         return -ENOENT;
 
                 ret = 0;
-                if (sta->key)
+                if (sta->key) {
                         ieee80211_key_free(sta->key);
-                else
+                        WARN_ON(sta->key);
+                } else
                         ret = -ENOENT;
 
-                sta_info_put(sta);
                 return ret;
         }
 
@@ -173,6 +198,7 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,
                 return -ENOENT;
 
         ieee80211_key_free(sdata->keys[key_idx]);
+        WARN_ON(sdata->keys[key_idx]);
 
         return 0;
 }
@@ -254,8 +280,6 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,
         err = 0;
 
  out:
-        if (sta)
-                sta_info_put(sta);
         return err;
 }
 
@@ -271,29 +295,73 @@ static int ieee80211_config_default_key(struct wiphy *wiphy,
         return 0;
 }
 
+static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
+{
+        struct ieee80211_sub_if_data *sdata = sta->sdata;
+
+        sinfo->filled = STATION_INFO_INACTIVE_TIME |
+                        STATION_INFO_RX_BYTES |
+                        STATION_INFO_TX_BYTES;
+
+        sinfo->inactive_time = jiffies_to_msecs(jiffies - sta->last_rx);
+        sinfo->rx_bytes = sta->rx_bytes;
+        sinfo->tx_bytes = sta->tx_bytes;
+
+        if (ieee80211_vif_is_mesh(&sdata->vif)) {
+#ifdef CONFIG_MAC80211_MESH
+                sinfo->filled |= STATION_INFO_LLID |
+                                 STATION_INFO_PLID |
+                                 STATION_INFO_PLINK_STATE;
+
+                sinfo->llid = le16_to_cpu(sta->llid);
+                sinfo->plid = le16_to_cpu(sta->plid);
+                sinfo->plink_state = sta->plink_state;
+#endif
+        }
+}
+
+
+static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev,
+                                 int idx, u8 *mac, struct station_info *sinfo)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct sta_info *sta;
+        int ret = -ENOENT;
+
+        rcu_read_lock();
+
+        sta = sta_info_get_by_idx(local, idx, dev);
+        if (sta) {
+                ret = 0;
+                memcpy(mac, sta->addr, ETH_ALEN);
+                sta_set_sinfo(sta, sinfo);
+        }
+
+        rcu_read_unlock();
+
+        return ret;
+}
+
 static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,
-                                 u8 *mac, struct station_stats *stats)
+                                 u8 *mac, struct station_info *sinfo)
 {
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct sta_info *sta;
+        int ret = -ENOENT;
 
-        sta = sta_info_get(local, mac);
-        if (!sta)
-                return -ENOENT;
+        rcu_read_lock();
 
         /* XXX: verify sta->dev == dev */
 
-        stats->filled = STATION_STAT_INACTIVE_TIME |
-                        STATION_STAT_RX_BYTES |
-                        STATION_STAT_TX_BYTES;
-
-        stats->inactive_time = jiffies_to_msecs(jiffies - sta->last_rx);
-        stats->rx_bytes = sta->rx_bytes;
-        stats->tx_bytes = sta->tx_bytes;
+        sta = sta_info_get(local, mac);
+        if (sta) {
+                ret = 0;
+                sta_set_sinfo(sta, sinfo);
+        }
 
-        sta_info_put(sta);
+        rcu_read_unlock();
 
-        return 0;
+        return ret;
 }
 
 /*
@@ -486,8 +554,8 @@ static void ieee80211_send_layer2_update(struct sta_info *sta)
         msg->xid_info[1] = 1;   /* LLC types/classes: Type 1 LLC */
         msg->xid_info[2] = 0;   /* XID sender's receive window size (RW) */
 
-        skb->dev = sta->dev;
-        skb->protocol = eth_type_trans(skb, sta->dev);
+        skb->dev = sta->sdata->dev;
+        skb->protocol = eth_type_trans(skb, sta->sdata->dev);
         memset(skb->cb, 0, sizeof(skb->cb));
         netif_rx(skb);
 }
@@ -498,7 +566,14 @@ static void sta_apply_parameters(struct ieee80211_local *local,
 {
         u32 rates;
         int i, j;
-        struct ieee80211_hw_mode *mode;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_sub_if_data *sdata = sta->sdata;
+
+        /*
+         * FIXME: updating the flags is racy when this function is
+         *        called from ieee80211_change_station(), this will
+         *        be resolved in a future patch.
+         */
 
         if (params->station_flags & STATION_FLAG_CHANGED) {
                 sta->flags &= ~WLAN_STA_AUTHORIZED;
@@ -514,6 +589,13 @@ static void sta_apply_parameters(struct ieee80211_local *local,
                         sta->flags |= WLAN_STA_WME;
         }
 
+        /*
+         * FIXME: updating the following information is racy when this
+         *        function is called from ieee80211_change_station().
+         *        However, all this information should be static so
+         *        maybe we should just reject attemps to change it.
+         */
+
         if (params->aid) {
                 sta->aid = params->aid;
                 if (sta->aid > IEEE80211_MAX_AID)
@@ -525,15 +607,27 @@ static void sta_apply_parameters(struct ieee80211_local *local,
 
         if (params->supported_rates) {
                 rates = 0;
-                mode = local->oper_hw_mode;
+                sband = local->hw.wiphy->bands[local->oper_channel->band];
+
                 for (i = 0; i < params->supported_rates_len; i++) {
                         int rate = (params->supported_rates[i] & 0x7f) * 5;
-                        for (j = 0; j < mode->num_rates; j++) {
-                                if (mode->rates[j].rate == rate)
+                        for (j = 0; j < sband->n_bitrates; j++) {
+                                if (sband->bitrates[j].bitrate == rate)
                                         rates |= BIT(j);
                         }
                 }
-                sta->supp_rates = rates;
+                sta->supp_rates[local->oper_channel->band] = rates;
+        }
+
+        if (ieee80211_vif_is_mesh(&sdata->vif) && params->plink_action) {
+                switch (params->plink_action) {
+                case PLINK_ACTION_OPEN:
+                        mesh_plink_open(sta);
+                        break;
+                case PLINK_ACTION_BLOCK:
+                        mesh_plink_block(sta);
+                        break;
+                }
         }
 }
 
@@ -543,18 +637,12 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct sta_info *sta;
         struct ieee80211_sub_if_data *sdata;
+        int err;
 
         /* Prevent a race with changing the rate control algorithm */
         if (!netif_running(dev))
                 return -ENETDOWN;
 
-        /* XXX: get sta belonging to dev */
-        sta = sta_info_get(local, mac);
-        if (sta) {
-                sta_info_put(sta);
-                return -EEXIST;
-        }
-
         if (params->vlan) {
                 sdata = IEEE80211_DEV_TO_SUB_IF(params->vlan);
 
@@ -564,22 +652,36 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
         } else
                 sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
-        sta = sta_info_add(local, dev, mac, GFP_KERNEL);
+        if (compare_ether_addr(mac, dev->dev_addr) == 0)
+                return -EINVAL;
+
+        if (is_multicast_ether_addr(mac))
+                return -EINVAL;
+
+        sta = sta_info_alloc(sdata, mac, GFP_KERNEL);
         if (!sta)
                 return -ENOMEM;
 
-        sta->dev = sdata->dev;
-        if (sdata->vif.type == IEEE80211_IF_TYPE_VLAN ||
-            sdata->vif.type == IEEE80211_IF_TYPE_AP)
-                ieee80211_send_layer2_update(sta);
-
         sta->flags = WLAN_STA_AUTH | WLAN_STA_ASSOC;
 
         sta_apply_parameters(local, sta, params);
 
         rate_control_rate_init(sta, local);
 
-        sta_info_put(sta);
+        rcu_read_lock();
+
+        err = sta_info_insert(sta);
+        if (err) {
+                sta_info_destroy(sta);
+                rcu_read_unlock();
+                return err;
+        }
+
+        if (sdata->vif.type == IEEE80211_IF_TYPE_VLAN ||
+            sdata->vif.type == IEEE80211_IF_TYPE_AP)
+                ieee80211_send_layer2_update(sta);
+
+        rcu_read_unlock();
 
         return 0;
 }
@@ -587,7 +689,8 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
 static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev,
                                  u8 *mac)
 {
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_local *local = sdata->local;
         struct sta_info *sta;
 
         if (mac) {
@@ -596,10 +699,14 @@ static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev,
                 if (!sta)
                         return -ENOENT;
 
-                sta_info_free(sta);
-                sta_info_put(sta);
+                sta_info_unlink(&sta);
+
+                if (sta) {
+                        synchronize_rcu();
+                        sta_info_destroy(sta);
+                }
         } else
-                sta_info_flush(local, dev);
+                sta_info_flush(local, sdata);
 
         return 0;
 }
@@ -618,23 +725,190 @@ static int ieee80211_change_station(struct wiphy *wiphy,
         if (!sta)
                 return -ENOENT;
 
-        if (params->vlan && params->vlan != sta->dev) {
+        if (params->vlan && params->vlan != sta->sdata->dev) {
                 vlansdata = IEEE80211_DEV_TO_SUB_IF(params->vlan);
 
                 if (vlansdata->vif.type != IEEE80211_IF_TYPE_VLAN ||
                     vlansdata->vif.type != IEEE80211_IF_TYPE_AP)
                         return -EINVAL;
 
-                sta->dev = params->vlan;
+                sta->sdata = IEEE80211_DEV_TO_SUB_IF(params->vlan);
                 ieee80211_send_layer2_update(sta);
         }
 
         sta_apply_parameters(local, sta, params);
 
-        sta_info_put(sta);
+        return 0;
+}
+
+#ifdef CONFIG_MAC80211_MESH
+static int ieee80211_add_mpath(struct wiphy *wiphy, struct net_device *dev,
+                                 u8 *dst, u8 *next_hop)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct mesh_path *mpath;
+        struct sta_info *sta;
+        int err;
+
+        if (!netif_running(dev))
+                return -ENETDOWN;
+
+        if (sdata->vif.type != IEEE80211_IF_TYPE_MESH_POINT)
+                return -ENOTSUPP;
+
+        rcu_read_lock();
+        sta = sta_info_get(local, next_hop);
+        if (!sta) {
+                rcu_read_unlock();
+                return -ENOENT;
+        }
+
+        err = mesh_path_add(dst, dev);
+        if (err) {
+                rcu_read_unlock();
+                return err;
+        }
+
+        mpath = mesh_path_lookup(dst, dev);
+        if (!mpath) {
+                rcu_read_unlock();
+                return -ENXIO;
+        }
+        mesh_path_fix_nexthop(mpath, sta);
+
+        rcu_read_unlock();
+        return 0;
+}
 
+static int ieee80211_del_mpath(struct wiphy *wiphy, struct net_device *dev,
+                                 u8 *dst)
+{
+        if (dst)
+                return mesh_path_del(dst, dev);
+
+        mesh_path_flush(dev);
+        return 0;
+}
+
+static int ieee80211_change_mpath(struct wiphy *wiphy,
+                                    struct net_device *dev,
+                                    u8 *dst, u8 *next_hop)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct mesh_path *mpath;
+        struct sta_info *sta;
+
+        if (!netif_running(dev))
+                return -ENETDOWN;
+
+        if (sdata->vif.type != IEEE80211_IF_TYPE_MESH_POINT)
+                return -ENOTSUPP;
+
+        rcu_read_lock();
+
+        sta = sta_info_get(local, next_hop);
+        if (!sta) {
+                rcu_read_unlock();
+                return -ENOENT;
+        }
+
+        mpath = mesh_path_lookup(dst, dev);
+        if (!mpath) {
+                rcu_read_unlock();
+                return -ENOENT;
+        }
+
+        mesh_path_fix_nexthop(mpath, sta);
+
+        rcu_read_unlock();
+        return 0;
+}
+
+static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop,
+                            struct mpath_info *pinfo)
+{
+        if (mpath->next_hop)
+                memcpy(next_hop, mpath->next_hop->addr, ETH_ALEN);
+        else
+                memset(next_hop, 0, ETH_ALEN);
+
+        pinfo->filled = MPATH_INFO_FRAME_QLEN |
+                        MPATH_INFO_DSN |
+                        MPATH_INFO_METRIC |
+                        MPATH_INFO_EXPTIME |
+                        MPATH_INFO_DISCOVERY_TIMEOUT |
+                        MPATH_INFO_DISCOVERY_RETRIES |
+                        MPATH_INFO_FLAGS;
+
+        pinfo->frame_qlen = mpath->frame_queue.qlen;
+        pinfo->dsn = mpath->dsn;
+        pinfo->metric = mpath->metric;
+        if (time_before(jiffies, mpath->exp_time))
+                pinfo->exptime = jiffies_to_msecs(mpath->exp_time - jiffies);
+        pinfo->discovery_timeout =
+                        jiffies_to_msecs(mpath->discovery_timeout);
+        pinfo->discovery_retries = mpath->discovery_retries;
+        pinfo->flags = 0;
+        if (mpath->flags & MESH_PATH_ACTIVE)
+                pinfo->flags |= NL80211_MPATH_FLAG_ACTIVE;
+        if (mpath->flags & MESH_PATH_RESOLVING)
+                pinfo->flags |= NL80211_MPATH_FLAG_RESOLVING;
+        if (mpath->flags & MESH_PATH_DSN_VALID)
+                pinfo->flags |= NL80211_MPATH_FLAG_DSN_VALID;
+        if (mpath->flags & MESH_PATH_FIXED)
+                pinfo->flags |= NL80211_MPATH_FLAG_FIXED;
+        if (mpath->flags & MESH_PATH_RESOLVING)
+                pinfo->flags |= NL80211_MPATH_FLAG_RESOLVING;
+
+        pinfo->flags = mpath->flags;
+}
+
+static int ieee80211_get_mpath(struct wiphy *wiphy, struct net_device *dev,
+                               u8 *dst, u8 *next_hop, struct mpath_info *pinfo)
+
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct mesh_path *mpath;
+
+        if (sdata->vif.type != IEEE80211_IF_TYPE_MESH_POINT)
+                return -ENOTSUPP;
+
+        rcu_read_lock();
+        mpath = mesh_path_lookup(dst, dev);
+        if (!mpath) {
+                rcu_read_unlock();
+                return -ENOENT;
+        }
+        memcpy(dst, mpath->dst, ETH_ALEN);
+        mpath_set_pinfo(mpath, next_hop, pinfo);
+        rcu_read_unlock();
+        return 0;
+}
+
+static int ieee80211_dump_mpath(struct wiphy *wiphy, struct net_device *dev,
+                                 int idx, u8 *dst, u8 *next_hop,
+                                 struct mpath_info *pinfo)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct mesh_path *mpath;
+
+        if (sdata->vif.type != IEEE80211_IF_TYPE_MESH_POINT)
+                return -ENOTSUPP;
+
+        rcu_read_lock();
+        mpath = mesh_path_lookup_by_idx(idx, dev);
+        if (!mpath) {
+                rcu_read_unlock();
+                return -ENOENT;
+        }
+        memcpy(dst, mpath->dst, ETH_ALEN);
+        mpath_set_pinfo(mpath, next_hop, pinfo);
+        rcu_read_unlock();
         return 0;
 }
+#endif
 
 struct cfg80211_ops mac80211_config_ops = {
         .add_virtual_intf = ieee80211_add_iface,
@@ -651,4 +925,12 @@ struct cfg80211_ops mac80211_config_ops = {
         .del_station = ieee80211_del_station,
         .change_station = ieee80211_change_station,
         .get_station = ieee80211_get_station,
+        .dump_station = ieee80211_dump_station,
+#ifdef CONFIG_MAC80211_MESH
+        .add_mpath = ieee80211_add_mpath,
+        .del_mpath = ieee80211_del_mpath,
+        .change_mpath = ieee80211_change_mpath,
+        .get_mpath = ieee80211_get_mpath,
+        .dump_mpath = ieee80211_dump_mpath,
+#endif
 };