Skip to content

L
linux-davinci
Commit 902acc78 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files
Options

mac80211: clean up mesh code 

Various cleanups, reducing the #ifdef mess and other things.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f7a92144
Show whitespace changes
Inline Side-by-side
Showing with 277 additions and 272 deletions
include/net/mac80211.h
View file @ 902acc78
...@@ -465,6 +465,14 @@ struct ieee80211_vif { ...@@ -465,6 +465,14 @@ struct ieee80211_vif {
u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *)))); u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
}; };
static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
{
#ifdef CONFIG_MAC80211_MESH
return vif->type == IEEE80211_IF_TYPE_MESH_POINT;
#endif
return false;
}
/** /**
* struct ieee80211_if_init_conf - initial configuration of an interface * struct ieee80211_if_init_conf - initial configuration of an interface
* *
......
net/mac80211/cfg.c
View file @ 902acc78
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
#include "ieee80211_i.h" #include "ieee80211_i.h"
#include "cfg.h" #include "cfg.h"
#include "ieee80211_rate.h" #include "ieee80211_rate.h"
#ifdef CONFIG_MAC80211_MESH
#include "mesh.h" #include "mesh.h"
#endif
#define DEFAULT_RATES 0 #define DEFAULT_RATES 0
...@@ -119,14 +117,10 @@ static int ieee80211_change_iface(struct wiphy *wiphy, int ifindex, ...@@ -119,14 +117,10 @@ static int ieee80211_change_iface(struct wiphy *wiphy, int ifindex,
ieee80211_if_reinit(dev); ieee80211_if_reinit(dev);
ieee80211_if_set_type(dev, itype); ieee80211_if_set_type(dev, itype);
#ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&sdata->vif) && params->mesh_id_len)
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT && ieee80211_if_sta_set_mesh_id(&sdata->u.sta,
params->mesh_id_len) { params->mesh_id_len,
sdata->u.sta.mesh_id_len = params->mesh_id_len; params->mesh_id);
memcpy(sdata->u.sta.mesh_id, params->mesh_id,
params->mesh_id_len);
}
#endif
if (sdata->vif.type != IEEE80211_IF_TYPE_MNTR || !flags) if (sdata->vif.type != IEEE80211_IF_TYPE_MNTR || !flags)
return 0; return 0;
...@@ -317,9 +311,7 @@ static int ieee80211_config_default_key(struct wiphy *wiphy, ...@@ -317,9 +311,7 @@ static int ieee80211_config_default_key(struct wiphy *wiphy,
static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
{ {
#ifdef CONFIG_MAC80211_MESH
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
#endif
sinfo->filled = STATION_INFO_INACTIVE_TIME | sinfo->filled = STATION_INFO_INACTIVE_TIME |
STATION_INFO_RX_BYTES | STATION_INFO_RX_BYTES |
...@@ -329,8 +321,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) ...@@ -329,8 +321,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
sinfo->rx_bytes = sta->rx_bytes; sinfo->rx_bytes = sta->rx_bytes;
sinfo->tx_bytes = sta->tx_bytes; sinfo->tx_bytes = sta->tx_bytes;
if (ieee80211_vif_is_mesh(&sdata->vif)) {
#ifdef CONFIG_MAC80211_MESH #ifdef CONFIG_MAC80211_MESH
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) {
sinfo->filled |= STATION_INFO_LLID | sinfo->filled |= STATION_INFO_LLID |
STATION_INFO_PLID | STATION_INFO_PLID |
STATION_INFO_PLINK_STATE; STATION_INFO_PLINK_STATE;
...@@ -338,8 +330,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) ...@@ -338,8 +330,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
sinfo->llid = le16_to_cpu(sta->llid); sinfo->llid = le16_to_cpu(sta->llid);
sinfo->plid = le16_to_cpu(sta->plid); sinfo->plid = le16_to_cpu(sta->plid);
sinfo->plink_state = sta->plink_state; sinfo->plink_state = sta->plink_state;
}
#endif #endif
}
} }
...@@ -580,9 +572,7 @@ static void sta_apply_parameters(struct ieee80211_local *local, ...@@ -580,9 +572,7 @@ static void sta_apply_parameters(struct ieee80211_local *local,
u32 rates; u32 rates;
int i, j; int i, j;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
#ifdef CONFIG_MAC80211_MESH
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
#endif
if (params->station_flags & STATION_FLAG_CHANGED) { if (params->station_flags & STATION_FLAG_CHANGED) {
sta->flags &= ~WLAN_STA_AUTHORIZED; sta->flags &= ~WLAN_STA_AUTHORIZED;
...@@ -621,9 +611,7 @@ static void sta_apply_parameters(struct ieee80211_local *local, ...@@ -621,9 +611,7 @@ static void sta_apply_parameters(struct ieee80211_local *local,
sta->supp_rates[local->oper_channel->band] = rates; sta->supp_rates[local->oper_channel->band] = rates;
} }
#ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&sdata->vif) && params->plink_action) {
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT &&
params->plink_action)
switch (params->plink_action) { switch (params->plink_action) {
case PLINK_ACTION_OPEN: case PLINK_ACTION_OPEN:
mesh_plink_open(sta); mesh_plink_open(sta);
...@@ -632,7 +620,7 @@ static void sta_apply_parameters(struct ieee80211_local *local, ...@@ -632,7 +620,7 @@ static void sta_apply_parameters(struct ieee80211_local *local,
mesh_plink_block(sta); mesh_plink_block(sta);
break; break;
} }
#endif }
} }
static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
...@@ -655,11 +643,9 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, ...@@ -655,11 +643,9 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
} else } else
sdata = IEEE80211_DEV_TO_SUB_IF(dev); sdata = IEEE80211_DEV_TO_SUB_IF(dev);
#ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&sdata->vif))
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT)
sta = mesh_plink_add(mac, DEFAULT_RATES, dev); sta = mesh_plink_add(mac, DEFAULT_RATES, dev);
else else
#endif
sta = sta_info_add(local, dev, mac, GFP_KERNEL); sta = sta_info_add(local, dev, mac, GFP_KERNEL);
if (IS_ERR(sta)) if (IS_ERR(sta))
......
net/mac80211/ieee80211.c
View file @ 902acc78
...@@ -26,9 +26,7 @@ ...@@ -26,9 +26,7 @@
#include "ieee80211_i.h" #include "ieee80211_i.h"
#include "ieee80211_rate.h" #include "ieee80211_rate.h"
#ifdef CONFIG_MAC80211_MESH
#include "mesh.h" #include "mesh.h"
#endif
#include "wep.h" #include "wep.h"
#include "wme.h" #include "wme.h"
#include "aes_ccm.h" #include "aes_ccm.h"
...@@ -938,11 +936,9 @@ static int __ieee80211_if_config(struct net_device *dev, ...@@ -938,11 +936,9 @@ static int __ieee80211_if_config(struct net_device *dev,
conf.bssid = sdata->u.sta.bssid; conf.bssid = sdata->u.sta.bssid;
conf.ssid = sdata->u.sta.ssid; conf.ssid = sdata->u.sta.ssid;
conf.ssid_len = sdata->u.sta.ssid_len; conf.ssid_len = sdata->u.sta.ssid_len;
#ifdef CONFIG_MAC80211_MESH } else if (ieee80211_vif_is_mesh(&sdata->vif)) {
} else if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) {
conf.beacon = beacon; conf.beacon = beacon;
ieee80211_start_mesh(dev); ieee80211_start_mesh(dev);
#endif
} else if (sdata->vif.type == IEEE80211_IF_TYPE_AP) { } else if (sdata->vif.type == IEEE80211_IF_TYPE_AP) {
conf.ssid = sdata->u.ap.ssid; conf.ssid = sdata->u.ap.ssid;
conf.ssid_len = sdata->u.ap.ssid_len; conf.ssid_len = sdata->u.ap.ssid_len;
...@@ -1824,10 +1820,9 @@ static void __exit ieee80211_exit(void) ...@@ -1824,10 +1820,9 @@ static void __exit ieee80211_exit(void)
rc80211_simple_exit(); rc80211_simple_exit();
rc80211_pid_exit(); rc80211_pid_exit();
#ifdef CONFIG_MAC80211_MESH
if (mesh_allocated) if (mesh_allocated)
ieee80211s_stop(); ieee80211s_stop();
#endif
ieee80211_wme_unregister(); ieee80211_wme_unregister();
ieee80211_debugfs_netdev_exit(); ieee80211_debugfs_netdev_exit();
} }
......
net/mac80211/ieee80211_i.h
View file @ 902acc78
...@@ -93,9 +93,8 @@ struct ieee80211_sta_bss { ...@@ -93,9 +93,8 @@ struct ieee80211_sta_bss {
#ifdef CONFIG_MAC80211_MESH #ifdef CONFIG_MAC80211_MESH
u8 *mesh_id; u8 *mesh_id;
size_t mesh_id_len; size_t mesh_id_len;
#endif
/* mesh_cfg left out the ifdef to reduce clutter on bss handling */
u8 *mesh_cfg; u8 *mesh_cfg;
#endif
#define IEEE80211_MAX_SUPP_RATES 32 #define IEEE80211_MAX_SUPP_RATES 32
u8 supp_rates[IEEE80211_MAX_SUPP_RATES]; u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
size_t supp_rates_len; size_t supp_rates_len;
...@@ -113,6 +112,30 @@ struct ieee80211_sta_bss { ...@@ -113,6 +112,30 @@ struct ieee80211_sta_bss {
u8 erp_value; u8 erp_value;
}; };
static inline u8 *bss_mesh_cfg(struct ieee80211_sta_bss *bss)
{
#ifdef CONFIG_MAC80211_MESH
return bss->mesh_cfg;
#endif
return NULL;
}
static inline u8 *bss_mesh_id(struct ieee80211_sta_bss *bss)
{
#ifdef CONFIG_MAC80211_MESH
return bss->mesh_id;
#endif
return NULL;
}
static inline u8 bss_mesh_id_len(struct ieee80211_sta_bss *bss)
{
#ifdef CONFIG_MAC80211_MESH
return bss->mesh_id_len;
#endif
return 0;
}
typedef unsigned __bitwise__ ieee80211_tx_result; typedef unsigned __bitwise__ ieee80211_tx_result;
#define TX_CONTINUE ((__force ieee80211_tx_result) 0u) #define TX_CONTINUE ((__force ieee80211_tx_result) 0u)
...@@ -233,7 +256,6 @@ struct ieee80211_if_vlan { ...@@ -233,7 +256,6 @@ struct ieee80211_if_vlan {
struct list_head list; struct list_head list;
}; };
#ifdef CONFIG_MAC80211_MESH
struct mesh_stats { struct mesh_stats {
__u32 fwded_frames; /* Mesh forwarded frames */ __u32 fwded_frames; /* Mesh forwarded frames */
__u32 dropped_frames_ttl; /* Not transmitted since mesh_ttl == 0*/ __u32 dropped_frames_ttl; /* Not transmitted since mesh_ttl == 0*/
...@@ -249,7 +271,6 @@ struct mesh_preq_queue { ...@@ -249,7 +271,6 @@ struct mesh_preq_queue {
u8 flags; u8 flags;
}; };
struct mesh_config { struct mesh_config {
/* Timeouts in ms */ /* Timeouts in ms */
/* Mesh plink management parameters */ /* Mesh plink management parameters */
...@@ -268,7 +289,7 @@ struct mesh_config { ...@@ -268,7 +289,7 @@ struct mesh_config {
u32 path_refresh_time; u32 path_refresh_time;
u16 min_discovery_timeout; u16 min_discovery_timeout;
}; };
#endif
/* flags used in struct ieee80211_if_sta.flags */ /* flags used in struct ieee80211_if_sta.flags */
#define IEEE80211_STA_SSID_SET BIT(0) #define IEEE80211_STA_SSID_SET BIT(0)
...@@ -361,6 +382,22 @@ struct ieee80211_if_sta { ...@@ -361,6 +382,22 @@ struct ieee80211_if_sta {
int num_beacons; /* number of TXed beacon frames by this STA */ int num_beacons; /* number of TXed beacon frames by this STA */
}; };
static inline void ieee80211_if_sta_set_mesh_id(struct ieee80211_if_sta *ifsta,
u8 mesh_id_len, u8 *mesh_id)
{
#ifdef CONFIG_MAC80211_MESH
ifsta->mesh_id_len = mesh_id_len;
memcpy(ifsta->mesh_id, mesh_id, mesh_id_len);
#endif
}
#ifdef CONFIG_MAC80211_MESH
#define IEEE80211_IFSTA_MESH_CTR_INC(sta, name) \
do { (sta)->mshstats.name++; } while (0)
#else
#define IEEE80211_IFSTA_MESH_CTR_INC(sta, name) \
do { } while (0)
#endif
/* flags used in struct ieee80211_sub_if_data.flags */ /* flags used in struct ieee80211_sub_if_data.flags */
#define IEEE80211_SDATA_ALLMULTI BIT(0) #define IEEE80211_SDATA_ALLMULTI BIT(0)
...@@ -884,12 +921,17 @@ void sta_addba_resp_timer_expired(unsigned long data); ...@@ -884,12 +921,17 @@ void sta_addba_resp_timer_expired(unsigned long data);
u64 ieee80211_sta_get_rates(struct ieee80211_local *local, u64 ieee80211_sta_get_rates(struct ieee80211_local *local,
struct ieee802_11_elems *elems, struct ieee802_11_elems *elems,
enum ieee80211_band band); enum ieee80211_band band);
void ieee80211_start_mesh(struct net_device *dev);
void ieee80211_sta_tx(struct net_device *dev, struct sk_buff *skb, void ieee80211_sta_tx(struct net_device *dev, struct sk_buff *skb,
int encrypt); int encrypt);
void ieee802_11_parse_elems(u8 *start, size_t len, void ieee802_11_parse_elems(u8 *start, size_t len,
struct ieee802_11_elems *elems); struct ieee802_11_elems *elems);
#ifdef CONFIG_MAC80211_MESH
void ieee80211_start_mesh(struct net_device *dev);
#else
static inline void ieee80211_start_mesh(struct net_device *dev)
{}
#endif
/* ieee80211_iface.c */ /* ieee80211_iface.c */
int ieee80211_if_add(struct net_device *dev, const char *name, int ieee80211_if_add(struct net_device *dev, const char *name,
......
net/mac80211/ieee80211_iface.c
View file @ 902acc78
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
#include "ieee80211_i.h" #include "ieee80211_i.h"
#include "sta_info.h" #include "sta_info.h"
#include "debugfs_netdev.h" #include "debugfs_netdev.h"
#ifdef CONFIG_MAC80211_MESH
#include "mesh.h" #include "mesh.h"
#endif
void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata) void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata)
{ {
...@@ -82,14 +80,11 @@ int ieee80211_if_add(struct net_device *dev, const char *name, ...@@ -82,14 +80,11 @@ int ieee80211_if_add(struct net_device *dev, const char *name,
ieee80211_debugfs_add_netdev(sdata); ieee80211_debugfs_add_netdev(sdata);
ieee80211_if_set_type(ndev, type); ieee80211_if_set_type(ndev, type);
#ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&sdata->vif) &&
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT && params && params->mesh_id_len)
params && params->mesh_id_len) { ieee80211_if_sta_set_mesh_id(&sdata->u.sta,
sdata->u.sta.mesh_id_len = params->mesh_id_len; params->mesh_id_len,
memcpy(sdata->u.sta.mesh_id, params->mesh_id, params->mesh_id);
params->mesh_id_len);
}
#endif
/* we're under RTNL so all this is fine */ /* we're under RTNL so all this is fine */
if (unlikely(local->reg_state == IEEE80211_DEV_UNREGISTERED)) { if (unlikely(local->reg_state == IEEE80211_DEV_UNREGISTERED)) {
...@@ -170,47 +165,8 @@ void ieee80211_if_set_type(struct net_device *dev, int type) ...@@ -170,47 +165,8 @@ void ieee80211_if_set_type(struct net_device *dev, int type)
msdata = IEEE80211_DEV_TO_SUB_IF(sdata->local->mdev); msdata = IEEE80211_DEV_TO_SUB_IF(sdata->local->mdev);
sdata->bss = &msdata->u.ap; sdata->bss = &msdata->u.ap;
#ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&sdata->vif))
if (type == IEEE80211_IF_TYPE_MESH_POINT) { ieee80211_mesh_init_sdata(sdata);
ifsta->mshcfg.dot11MeshRetryTimeout = MESH_RET_T;
ifsta->mshcfg.dot11MeshConfirmTimeout = MESH_CONF_T;
ifsta->mshcfg.dot11MeshHoldingTimeout = MESH_HOLD_T;
ifsta->mshcfg.dot11MeshMaxRetries = MESH_MAX_RETR;
ifsta->mshcfg.dot11MeshTTL = MESH_TTL;
ifsta->mshcfg.auto_open_plinks = true;
ifsta->mshcfg.dot11MeshMaxPeerLinks =
MESH_MAX_ESTAB_PLINKS;
ifsta->mshcfg.dot11MeshHWMPactivePathTimeout =
MESH_PATH_TIMEOUT;
ifsta->mshcfg.dot11MeshHWMPpreqMinInterval =
MESH_PREQ_MIN_INT;
ifsta->mshcfg.dot11MeshHWMPnetDiameterTraversalTime =
MESH_DIAM_TRAVERSAL_TIME;
ifsta->mshcfg.dot11MeshHWMPmaxPREQretries =
MESH_MAX_PREQ_RETRIES;
ifsta->mshcfg.path_refresh_time =
MESH_PATH_REFRESH_TIME;
ifsta->mshcfg.min_discovery_timeout =
MESH_MIN_DISCOVERY_TIMEOUT;
ifsta->accepting_plinks = true;
ifsta->preq_id = 0;
ifsta->dsn = 0;
atomic_set(&ifsta->mpaths, 0);
mesh_rmc_init(dev);
ifsta->last_preq = jiffies;
/* Allocate all mesh structures when creating the first
* mesh interface.
*/
if (!mesh_allocated)
ieee80211s_init();
mesh_ids_set_default(ifsta);
setup_timer(&ifsta->mesh_path_timer,
ieee80211_mesh_path_timer,
(unsigned long) sdata);
INIT_LIST_HEAD(&ifsta->preq_queue.list);
spin_lock_init(&ifsta->mesh_preq_queue_lock);
}
#endif
break; break;
} }
case IEEE80211_IF_TYPE_MNTR: case IEEE80211_IF_TYPE_MNTR:
...@@ -240,6 +196,10 @@ void ieee80211_if_reinit(struct net_device *dev) ...@@ -240,6 +196,10 @@ void ieee80211_if_reinit(struct net_device *dev)
ieee80211_if_sdata_deinit(sdata); ieee80211_if_sdata_deinit(sdata);
/* Need to handle mesh specially to allow eliding the function call */
if (ieee80211_vif_is_mesh(&sdata->vif))
mesh_rmc_free(dev);
switch (sdata->vif.type) { switch (sdata->vif.type) {
case IEEE80211_IF_TYPE_INVALID: case IEEE80211_IF_TYPE_INVALID:
/* cannot happen */ /* cannot happen */
...@@ -292,10 +252,6 @@ void ieee80211_if_reinit(struct net_device *dev) ...@@ -292,10 +252,6 @@ void ieee80211_if_reinit(struct net_device *dev)
} }
break; break;
case IEEE80211_IF_TYPE_MESH_POINT: case IEEE80211_IF_TYPE_MESH_POINT:
#ifdef CONFIG_MAC80211_MESH
mesh_rmc_free(dev);
#endif
/* fall through */
case IEEE80211_IF_TYPE_STA: case IEEE80211_IF_TYPE_STA:
case IEEE80211_IF_TYPE_IBSS: case IEEE80211_IF_TYPE_IBSS:
kfree(sdata->u.sta.extra_ie); kfree(sdata->u.sta.extra_ie);
......
net/mac80211/ieee80211_sta.c
View file @ 902acc78
...@@ -31,9 +31,7 @@ ...@@ -31,9 +31,7 @@
#include "ieee80211_i.h" #include "ieee80211_i.h"
#include "ieee80211_rate.h" #include "ieee80211_rate.h"
#include "ieee80211_led.h" #include "ieee80211_led.h"
#ifdef CONFIG_MAC80211_MESH
#include "mesh.h" #include "mesh.h"
#endif
#define IEEE80211_AUTH_TIMEOUT (HZ / 5) #define IEEE80211_AUTH_TIMEOUT (HZ / 5)
#define IEEE80211_AUTH_MAX_TRIES 3 #define IEEE80211_AUTH_MAX_TRIES 3
...@@ -1897,12 +1895,13 @@ static void __ieee80211_rx_bss_hash_add(struct net_device *dev, ...@@ -1897,12 +1895,13 @@ static void __ieee80211_rx_bss_hash_add(struct net_device *dev,
{ {
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
u8 hash_idx; u8 hash_idx;
#ifdef CONFIG_MAC80211_MESH
if (bss->mesh_cfg) if (bss_mesh_cfg(bss))
hash_idx = mesh_id_hash(bss->mesh_id, bss->mesh_id_len); hash_idx = mesh_id_hash(bss_mesh_id(bss),
bss_mesh_id_len(bss));
else else
#endif
hash_idx = STA_HASH(bss->bssid); hash_idx = STA_HASH(bss->bssid);
bss->hnext = local->sta_bss_hash[hash_idx]; bss->hnext = local->sta_bss_hash[hash_idx];
local->sta_bss_hash[hash_idx] = bss; local->sta_bss_hash[hash_idx] = bss;
} }
...@@ -1967,7 +1966,8 @@ ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int freq, ...@@ -1967,7 +1966,8 @@ ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int freq,
spin_lock_bh(&local->sta_bss_lock); spin_lock_bh(&local->sta_bss_lock);
bss = local->sta_bss_hash[STA_HASH(bssid)]; bss = local->sta_bss_hash[STA_HASH(bssid)];
while (bss) { while (bss) {
if (!bss->mesh_cfg && !memcmp(bss->bssid, bssid, ETH_ALEN) && if (!bss_mesh_cfg(bss) &&
!memcmp(bss->bssid, bssid, ETH_ALEN) &&
bss->freq == freq && bss->freq == freq &&
bss->ssid_len == ssid_len && bss->ssid_len == ssid_len &&
(ssid_len == 0 || !memcmp(bss->ssid, ssid, ssid_len))) { (ssid_len == 0 || !memcmp(bss->ssid, ssid, ssid_len))) {
...@@ -1991,8 +1991,8 @@ ieee80211_rx_mesh_bss_get(struct net_device *dev, u8 *mesh_id, int mesh_id_len, ...@@ -1991,8 +1991,8 @@ ieee80211_rx_mesh_bss_get(struct net_device *dev, u8 *mesh_id, int mesh_id_len,
spin_lock_bh(&local->sta_bss_lock); spin_lock_bh(&local->sta_bss_lock);
bss = local->sta_bss_hash[mesh_id_hash(mesh_id, mesh_id_len)]; bss = local->sta_bss_hash[mesh_id_hash(mesh_id, mesh_id_len)];
while (bss) { while (bss) {
if (bss->mesh_cfg && if (bss_mesh_cfg(bss) &&
!memcmp(bss->mesh_cfg, mesh_cfg, MESH_CFG_CMP_LEN) && !memcmp(bss_mesh_cfg(bss), mesh_cfg, MESH_CFG_CMP_LEN) &&
bss->freq == freq && bss->freq == freq &&
mesh_id_len == bss->mesh_id_len && mesh_id_len == bss->mesh_id_len &&
(mesh_id_len == 0 || !memcmp(bss->mesh_id, mesh_id, (mesh_id_len == 0 || !memcmp(bss->mesh_id, mesh_id,
...@@ -2053,10 +2053,8 @@ static void ieee80211_rx_bss_free(struct ieee80211_sta_bss *bss) ...@@ -2053,10 +2053,8 @@ static void ieee80211_rx_bss_free(struct ieee80211_sta_bss *bss)
kfree(bss->rsn_ie); kfree(bss->rsn_ie);
kfree(bss->wmm_ie); kfree(bss->wmm_ie);
kfree(bss->ht_ie); kfree(bss->ht_ie);
#ifdef CONFIG_MAC80211_MESH kfree(bss_mesh_id(bss));
kfree(bss->mesh_id); kfree(bss_mesh_cfg(bss));
kfree(bss->mesh_cfg);
#endif
kfree(bss); kfree(bss);
} }
...@@ -2322,16 +2320,14 @@ static void ieee80211_rx_bss_info(struct net_device *dev, ...@@ -2322,16 +2320,14 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
beacon_timestamp = le64_to_cpu(mgmt->u.beacon.timestamp); beacon_timestamp = le64_to_cpu(mgmt->u.beacon.timestamp);
ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen, &elems); ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen, &elems);
#ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&sdata->vif) && elems.mesh_id &&
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT && elems.mesh_id elems.mesh_config && mesh_matches_local(&elems, dev)) {
&& elems.mesh_config)
if (mesh_matches_local(&elems, dev)) {
u64 rates = ieee80211_sta_get_rates(local, &elems, u64 rates = ieee80211_sta_get_rates(local, &elems,
rx_status->band); rx_status->band);
mesh_neighbour_update(mgmt->sa, rates, dev, mesh_neighbour_update(mgmt->sa, rates, dev,
mesh_peer_accepts_plinks(&elems, dev)); mesh_peer_accepts_plinks(&elems, dev));
} }
#endif
if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS && elems.supp_rates && if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS && elems.supp_rates &&
memcmp(mgmt->bssid, sdata->u.sta.bssid, ETH_ALEN) == 0 && memcmp(mgmt->bssid, sdata->u.sta.bssid, ETH_ALEN) == 0 &&
...@@ -2712,9 +2708,7 @@ static void ieee80211_rx_mgmt_action(struct net_device *dev, ...@@ -2712,9 +2708,7 @@ static void ieee80211_rx_mgmt_action(struct net_device *dev,
size_t len, size_t len,
struct ieee80211_rx_status *rx_status) struct ieee80211_rx_status *rx_status)
{ {
#ifdef CONFIG_MAC80211_MESH
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
#endif
if (len < IEEE80211_MIN_ACTION_SIZE) if (len < IEEE80211_MIN_ACTION_SIZE)
return; return;
...@@ -2747,17 +2741,14 @@ static void ieee80211_rx_mgmt_action(struct net_device *dev, ...@@ -2747,17 +2741,14 @@ static void ieee80211_rx_mgmt_action(struct net_device *dev,
break; break;
} }
break; break;
#ifdef CONFIG_MAC80211_MESH
case PLINK_CATEGORY: case PLINK_CATEGORY:
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) if (ieee80211_vif_is_mesh(&sdata->vif))
mesh_rx_plink_frame(dev, mgmt, len, rx_status); mesh_rx_plink_frame(dev, mgmt, len, rx_status);
break; break;
case MESH_PATH_SEL_CATEGORY: case MESH_PATH_SEL_CATEGORY:
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) if (ieee80211_vif_is_mesh(&sdata->vif))
mesh_rx_path_sel_frame(dev, mgmt, len); mesh_rx_path_sel_frame(dev, mgmt, len);
break; break;
#endif
default: default:
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_DEBUG "%s: Rx unknown action frame - " printk(KERN_DEBUG "%s: Rx unknown action frame - "
...@@ -3027,8 +3018,9 @@ void ieee80211_sta_work(struct work_struct *work) ...@@ -3027,8 +3018,9 @@ void ieee80211_sta_work(struct work_struct *work)
ieee80211_sta_rx_queued_mgmt(dev, skb); ieee80211_sta_rx_queued_mgmt(dev, skb);
#ifdef CONFIG_MAC80211_MESH #ifdef CONFIG_MAC80211_MESH
if (ifsta->preq_queue_len && time_after(jiffies, ifsta->last_preq + if (ifsta->preq_queue_len &&
msecs_to_jiffies(ifsta->mshcfg.dot11MeshHWMPpreqMinInterval))) time_after(jiffies,
ifsta->last_preq + msecs_to_jiffies(ifsta->mshcfg.dot11MeshHWMPpreqMinInterval)))
mesh_path_start_discovery(dev); mesh_path_start_discovery(dev);
#endif #endif
...@@ -3810,13 +3802,11 @@ ieee80211_sta_scan_result(struct net_device *dev, ...@@ -3810,13 +3802,11 @@ ieee80211_sta_scan_result(struct net_device *dev,
memset(&iwe, 0, sizeof(iwe)); memset(&iwe, 0, sizeof(iwe));
iwe.cmd = SIOCGIWESSID; iwe.cmd = SIOCGIWESSID;
if (bss->mesh_cfg) { if (bss_mesh_cfg(bss)) {
#ifdef CONFIG_MAC80211_MESH iwe.u.data.length = bss_mesh_id_len(bss);
iwe.u.data.length = bss->mesh_id_len;
iwe.u.data.flags = 1; iwe.u.data.flags = 1;
current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
bss->mesh_id); bss_mesh_id(bss));
#endif
} else { } else {
iwe.u.data.length = bss->ssid_len; iwe.u.data.length = bss->ssid_len;
iwe.u.data.flags = 1; iwe.u.data.flags = 1;
...@@ -3825,10 +3815,10 @@ ieee80211_sta_scan_result(struct net_device *dev, ...@@ -3825,10 +3815,10 @@ ieee80211_sta_scan_result(struct net_device *dev,
} }
if (bss->capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS if (bss->capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS
|| bss->mesh_cfg)) { || bss_mesh_cfg(bss))) {
memset(&iwe, 0, sizeof(iwe)); memset(&iwe, 0, sizeof(iwe));
iwe.cmd = SIOCGIWMODE; iwe.cmd = SIOCGIWMODE;
if (bss->mesh_cfg) if (bss_mesh_cfg(bss))
iwe.u.mode = IW_MODE_MESH; iwe.u.mode = IW_MODE_MESH;
else if (bss->capability & WLAN_CAPABILITY_ESS) else if (bss->capability & WLAN_CAPABILITY_ESS)
iwe.u.mode = IW_MODE_MASTER; iwe.u.mode = IW_MODE_MASTER;
...@@ -3919,9 +3909,9 @@ ieee80211_sta_scan_result(struct net_device *dev, ...@@ -3919,9 +3909,9 @@ ieee80211_sta_scan_result(struct net_device *dev,
} }
} }
if (bss->mesh_cfg) { if (bss_mesh_cfg(bss)) {
char *buf; char *buf;
u8 *cfg = bss->mesh_cfg; u8 *cfg = bss_mesh_cfg(bss);
buf = kmalloc(200, GFP_ATOMIC); buf = kmalloc(200, GFP_ATOMIC);
if (buf) { if (buf) {
memset(&iwe, 0, sizeof(iwe)); memset(&iwe, 0, sizeof(iwe));
......
net/mac80211/mesh.c
View file @ 902acc78
...@@ -381,3 +381,70 @@ endgrow: ...@@ -381,3 +381,70 @@ endgrow:
else else
return newtbl; return newtbl;
} }
/**
* ieee80211_new_mesh_header - create a new mesh header
* @meshhdr: uninitialized mesh header
* @sdata: mesh interface to be used
*
* Return the header length.
*/
int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,
struct ieee80211_sub_if_data *sdata)
{
meshhdr->flags = 0;
meshhdr->ttl = sdata->u.sta.mshcfg.dot11MeshTTL;
meshhdr->seqnum[0] = sdata->u.sta.mesh_seqnum[0]++;
meshhdr->seqnum[1] = sdata->u.sta.mesh_seqnum[1];
meshhdr->seqnum[2] = sdata->u.sta.mesh_seqnum[2];
if (sdata->u.sta.mesh_seqnum[0] == 0) {
sdata->u.sta.mesh_seqnum[1]++;
if (sdata->u.sta.mesh_seqnum[1] == 0)
sdata->u.sta.mesh_seqnum[2]++;
}
return 5;
}
void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
{
struct ieee80211_if_sta *ifsta = &sdata->u.sta;
ifsta->mshcfg.dot11MeshRetryTimeout = MESH_RET_T;
ifsta->mshcfg.dot11MeshConfirmTimeout = MESH_CONF_T;
ifsta->mshcfg.dot11MeshHoldingTimeout = MESH_HOLD_T;
ifsta->mshcfg.dot11MeshMaxRetries = MESH_MAX_RETR;
ifsta->mshcfg.dot11MeshTTL = MESH_TTL;
ifsta->mshcfg.auto_open_plinks = true;
ifsta->mshcfg.dot11MeshMaxPeerLinks =
MESH_MAX_ESTAB_PLINKS;
ifsta->mshcfg.dot11MeshHWMPactivePathTimeout =
MESH_PATH_TIMEOUT;
ifsta->mshcfg.dot11MeshHWMPpreqMinInterval =
MESH_PREQ_MIN_INT;
ifsta->mshcfg.dot11MeshHWMPnetDiameterTraversalTime =
MESH_DIAM_TRAVERSAL_TIME;
ifsta->mshcfg.dot11MeshHWMPmaxPREQretries =
MESH_MAX_PREQ_RETRIES;
ifsta->mshcfg.path_refresh_time =
MESH_PATH_REFRESH_TIME;
ifsta->mshcfg.min_discovery_timeout =
MESH_MIN_DISCOVERY_TIMEOUT;
ifsta->accepting_plinks = true;
ifsta->preq_id = 0;
ifsta->dsn = 0;
atomic_set(&ifsta->mpaths, 0);
mesh_rmc_init(sdata->dev);
ifsta->last_preq = jiffies;
/* Allocate all mesh structures when creating the first mesh interface. */
if (!mesh_allocated)
ieee80211s_init();
mesh_ids_set_default(ifsta);
setup_timer(&ifsta->mesh_path_timer,
ieee80211_mesh_path_timer,
(unsigned long) sdata);
INIT_LIST_HEAD(&ifsta->preq_queue.list);
spin_lock_init(&ifsta->mesh_preq_queue_lock);
}
net/mac80211/mesh.h
View file @ 902acc78
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
#ifndef IEEE80211S_H #ifndef IEEE80211S_H
#define IEEE80211S_H #define IEEE80211S_H
#include "ieee80211_i.h" #include <linux/types.h>
#include <linux/jhash.h> #include <linux/jhash.h>
#include "ieee80211_i.h"
extern int mesh_allocated;
/* Data structures */ /* Data structures */
...@@ -211,6 +211,8 @@ void mesh_rmc_free(struct net_device *dev); ...@@ -211,6 +211,8 @@ void mesh_rmc_free(struct net_device *dev);
int mesh_rmc_init(struct net_device *dev); int mesh_rmc_init(struct net_device *dev);
void ieee80211s_init(void); void ieee80211s_init(void);
void ieee80211s_stop(void); void ieee80211s_stop(void);
void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata);
/* Mesh paths */ /* Mesh paths */
int mesh_nexthop_lookup(u8 *next_hop, struct sk_buff *skb, int mesh_nexthop_lookup(u8 *next_hop, struct sk_buff *skb,
struct net_device *dev); struct net_device *dev);
...@@ -257,6 +259,9 @@ void mesh_path_timer(unsigned long data); ...@@ -257,6 +259,9 @@ void mesh_path_timer(unsigned long data);
void mesh_path_flush_by_nexthop(struct sta_info *sta); void mesh_path_flush_by_nexthop(struct sta_info *sta);
void mesh_path_discard_frame(struct sk_buff *skb, struct net_device *dev); void mesh_path_discard_frame(struct sk_buff *skb, struct net_device *dev);
#ifdef CONFIG_MAC80211_MESH
extern int mesh_allocated;
static inline int mesh_plink_free_count(struct ieee80211_sub_if_data *sdata) static inline int mesh_plink_free_count(struct ieee80211_sub_if_data *sdata)
{ {
return sdata->u.sta.mshcfg.dot11MeshMaxPeerLinks - return sdata->u.sta.mshcfg.dot11MeshMaxPeerLinks -
...@@ -278,6 +283,10 @@ static inline void mesh_path_activate(struct mesh_path *mpath) ...@@ -278,6 +283,10 @@ static inline void mesh_path_activate(struct mesh_path *mpath)
for (i = 0; i <= x->hash_mask; i++) \ for (i = 0; i <= x->hash_mask; i++) \
hlist_for_each_entry_rcu(node, p, &x->hash_buckets[i], list) hlist_for_each_entry_rcu(node, p, &x->hash_buckets[i], list)
#else
#define mesh_allocated 0
#endif
#define MESH_PREQ(skb) (skb->cb + 30) #define MESH_PREQ(skb) (skb->cb + 30)
#endif /* IEEE80211S_H */ #endif /* IEEE80211S_H */
net/mac80211/mesh_plink.c
View file @ 902acc78
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/kernel.h>
#include <linux/random.h>
#include "ieee80211_i.h" #include "ieee80211_i.h"
#include "ieee80211_rate.h" #include "ieee80211_rate.h"
#include "mesh.h" #include "mesh.h"
#include <linux/random.h>
#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
#define mpl_dbg(fmt, args...) printk(KERN_DEBUG fmt, ##args) #define mpl_dbg(fmt, args...) printk(KERN_DEBUG fmt, ##args)
...@@ -131,7 +131,7 @@ struct sta_info *mesh_plink_add(u8 *hw_addr, u64 rates, struct net_device *dev) ...@@ -131,7 +131,7 @@ struct sta_info *mesh_plink_add(u8 *hw_addr, u64 rates, struct net_device *dev)
} }
/** /**
* mesh_plink_deactivate - deactivate mesh peer link * __mesh_plink_deactivate - deactivate mesh peer link
* *
* @sta: mesh peer link to deactivate * @sta: mesh peer link to deactivate
* *
...@@ -139,7 +139,7 @@ struct sta_info *mesh_plink_add(u8 *hw_addr, u64 rates, struct net_device *dev) ...@@ -139,7 +139,7 @@ struct sta_info *mesh_plink_add(u8 *hw_addr, u64 rates, struct net_device *dev)
* *
* Locking: the caller must hold sta->plink_lock * Locking: the caller must hold sta->plink_lock
*/ */
void mesh_plink_deactivate(struct sta_info *sta) static void __mesh_plink_deactivate(struct sta_info *sta)
{ {
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
if (sta->plink_state == ESTAB) if (sta->plink_state == ESTAB)
...@@ -148,6 +148,20 @@ void mesh_plink_deactivate(struct sta_info *sta) ...@@ -148,6 +148,20 @@ void mesh_plink_deactivate(struct sta_info *sta)
mesh_path_flush_by_nexthop(sta); mesh_path_flush_by_nexthop(sta);
} }
/**
* __mesh_plink_deactivate - deactivate mesh peer link
*
* @sta: mesh peer link to deactivate
*
* All mesh paths with this peer as next hop will be flushed
*/
void mesh_plink_deactivate(struct sta_info *sta)
{
spin_lock_bh(&sta->plink_lock);
__mesh_plink_deactivate(sta);
spin_unlock_bh(&sta->plink_lock);
}
static int mesh_plink_frame_tx(struct net_device *dev, static int mesh_plink_frame_tx(struct net_device *dev,
enum plink_frame_type action, u8 *da, __le16 llid, __le16 plid, enum plink_frame_type action, u8 *da, __le16 llid, __le16 plid,
__le16 reason) { __le16 reason) {
...@@ -365,7 +379,7 @@ void mesh_plink_block(struct sta_info *sta) ...@@ -365,7 +379,7 @@ void mesh_plink_block(struct sta_info *sta)
#endif #endif
spin_lock_bh(&sta->plink_lock); spin_lock_bh(&sta->plink_lock);
mesh_plink_deactivate(sta); __mesh_plink_deactivate(sta);
sta->plink_state = BLOCKED; sta->plink_state = BLOCKED;
spin_unlock_bh(&sta->plink_lock); spin_unlock_bh(&sta->plink_lock);
} }
...@@ -390,7 +404,7 @@ int mesh_plink_close(struct sta_info *sta) ...@@ -390,7 +404,7 @@ int mesh_plink_close(struct sta_info *sta)
sta_info_put(sta); sta_info_put(sta);
return 0; return 0;
} else if (sta->plink_state == ESTAB) { } else if (sta->plink_state == ESTAB) {
mesh_plink_deactivate(sta); __mesh_plink_deactivate(sta);
/* The timer should not be running */ /* The timer should not be running */
if (!mod_plink_timer(sta, dot11MeshHoldingTimeout(sdata))) if (!mod_plink_timer(sta, dot11MeshHoldingTimeout(sdata)))
__sta_info_get(sta); __sta_info_get(sta);
...@@ -699,7 +713,7 @@ void mesh_rx_plink_frame(struct net_device *dev, struct ieee80211_mgmt *mgmt, ...@@ -699,7 +713,7 @@ void mesh_rx_plink_frame(struct net_device *dev, struct ieee80211_mgmt *mgmt,
case CLS_ACPT: case CLS_ACPT:
reason = cpu_to_le16(MESH_CLOSE_RCVD); reason = cpu_to_le16(MESH_CLOSE_RCVD);
sta->reason = reason; sta->reason = reason;
mesh_plink_deactivate(sta); __mesh_plink_deactivate(sta);
sta->plink_state = HOLDING; sta->plink_state = HOLDING;
llid = sta->llid; llid = sta->llid;
if (!mod_plink_timer(sta, if (!mod_plink_timer(sta,
......
net/mac80211/rc80211_pid_algo.c
View file @ 902acc78
...@@ -15,10 +15,7 @@ ...@@ -15,10 +15,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <net/mac80211.h> #include <net/mac80211.h>
#include "ieee80211_rate.h" #include "ieee80211_rate.h"
#ifdef CONFIG_MAC80211_MESH
#include "mesh.h" #include "mesh.h"
#endif
#include "rc80211_pid.h" #include "rc80211_pid.h"
......
net/mac80211/rx.c
View file @ 902acc78
...@@ -20,9 +20,7 @@ ...@@ -20,9 +20,7 @@
#include "ieee80211_i.h" #include "ieee80211_i.h"
#include "ieee80211_led.h" #include "ieee80211_led.h"
#ifdef CONFIG_MAC80211_MESH
#include "mesh.h" #include "mesh.h"
#endif
#include "wep.h" #include "wep.h"
#include "wpa.h" #include "wpa.h"
#include "tkip.h" #include "tkip.h"
...@@ -439,6 +437,13 @@ ieee80211_rx_mesh_check(struct ieee80211_txrx_data *rx) ...@@ -439,6 +437,13 @@ ieee80211_rx_mesh_check(struct ieee80211_txrx_data *rx)
else else
return RX_CONTINUE; return RX_CONTINUE;
} }
#undef msh_h_get
#else
static inline ieee80211_rx_result
ieee80211_rx_mesh_check(struct ieee80211_txrx_data *rx)
{
return RX_CONTINUE;
}
#endif #endif
...@@ -477,10 +482,8 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx) ...@@ -477,10 +482,8 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
* responsible for filtering on both auth and assoc states. * responsible for filtering on both auth and assoc states.
*/ */
#ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&rx->sdata->vif))
if (rx->sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT)
return ieee80211_rx_mesh_check(rx); return ieee80211_rx_mesh_check(rx);
#endif
if (unlikely(((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA || if (unlikely(((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA ||
((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL && ((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL &&
...@@ -1111,8 +1114,7 @@ ieee80211_data_to_8023(struct ieee80211_txrx_data *rx) ...@@ -1111,8 +1114,7 @@ ieee80211_data_to_8023(struct ieee80211_txrx_data *rx)
hdrlen = ieee80211_get_hdrlen(fc); hdrlen = ieee80211_get_hdrlen(fc);
#ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&sdata->vif)) {
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) {
int meshhdrlen = ieee80211_get_mesh_hdrlen( int meshhdrlen = ieee80211_get_mesh_hdrlen(
(struct ieee80211s_hdr *) (skb->data + hdrlen)); (struct ieee80211s_hdr *) (skb->data + hdrlen));
/* Copy on cb: /* Copy on cb:
...@@ -1126,7 +1128,6 @@ ieee80211_data_to_8023(struct ieee80211_txrx_data *rx) ...@@ -1126,7 +1128,6 @@ ieee80211_data_to_8023(struct ieee80211_txrx_data *rx)
memcpy(MESH_PREQ(skb), hdr->addr2, ETH_ALEN); memcpy(MESH_PREQ(skb), hdr->addr2, ETH_ALEN);
hdrlen += meshhdrlen; hdrlen += meshhdrlen;
} }
#endif
/* convert IEEE 802.11 header + possible LLC headers into Ethernet /* convert IEEE 802.11 header + possible LLC headers into Ethernet
* header * header
...@@ -1306,9 +1307,8 @@ ieee80211_deliver_skb(struct ieee80211_txrx_data *rx) ...@@ -1306,9 +1307,8 @@ ieee80211_deliver_skb(struct ieee80211_txrx_data *rx)
} }
} }
#ifdef CONFIG_MAC80211_MESH
/* Mesh forwarding */ /* Mesh forwarding */
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) { if (ieee80211_vif_is_mesh(&sdata->vif)) {
u8 *mesh_ttl = &((struct ieee80211s_hdr *)skb->cb)->ttl; u8 *mesh_ttl = &((struct ieee80211s_hdr *)skb->cb)->ttl;
(*mesh_ttl)--; (*mesh_ttl)--;
...@@ -1321,12 +1321,13 @@ ieee80211_deliver_skb(struct ieee80211_txrx_data *rx) ...@@ -1321,12 +1321,13 @@ ieee80211_deliver_skb(struct ieee80211_txrx_data *rx)
else else
xmit_skb->pkt_type = PACKET_OTHERHOST; xmit_skb->pkt_type = PACKET_OTHERHOST;
} else } else
sdata->u.sta.mshstats.dropped_frames_ttl++; IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.sta,
dropped_frames_ttl);
} else if (skb->pkt_type != PACKET_OTHERHOST && } else if (skb->pkt_type != PACKET_OTHERHOST &&
compare_ether_addr(dev->dev_addr, skb->data) != 0) { compare_ether_addr(dev->dev_addr, skb->data) != 0) {
if (*mesh_ttl == 0) { if (*mesh_ttl == 0) {
sdata->u.sta.mshstats.dropped_frames_ttl++; IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.sta,
dropped_frames_ttl);
dev_kfree_skb(skb); dev_kfree_skb(skb);
skb = NULL; skb = NULL;
} else { } else {
...@@ -1337,7 +1338,6 @@ ieee80211_deliver_skb(struct ieee80211_txrx_data *rx) ...@@ -1337,7 +1338,6 @@ ieee80211_deliver_skb(struct ieee80211_txrx_data *rx)
} }
} }
} }
#endif
if (skb) { if (skb) {
/* deliver to local stack */ /* deliver to local stack */
......
net/mac80211/sta_info.c
View file @ 902acc78
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
#include "ieee80211_rate.h" #include "ieee80211_rate.h"
#include "sta_info.h" #include "sta_info.h"
#include "debugfs_sta.h" #include "debugfs_sta.h"
#ifdef CONFIG_MAC80211_MESH
#include "mesh.h" #include "mesh.h"
#endif
/* Caller must hold local->sta_lock */ /* Caller must hold local->sta_lock */
static void sta_info_hash_add(struct ieee80211_local *local, static void sta_info_hash_add(struct ieee80211_local *local,
...@@ -309,10 +307,8 @@ void sta_info_remove(struct sta_info *sta) ...@@ -309,10 +307,8 @@ void sta_info_remove(struct sta_info *sta)
} }
local->num_sta--; local->num_sta--;
#ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&sdata->vif))
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT)
mesh_accept_plinks_update(sdata->dev); mesh_accept_plinks_update(sdata->dev);
#endif
} }
void sta_info_free(struct sta_info *sta) void sta_info_free(struct sta_info *sta)
...@@ -329,13 +325,8 @@ void sta_info_free(struct sta_info *sta) ...@@ -329,13 +325,8 @@ void sta_info_free(struct sta_info *sta)
sta_info_remove(sta); sta_info_remove(sta);
write_unlock_bh(&local->sta_lock); write_unlock_bh(&local->sta_lock);
#ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&sdata->vif))
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) {
spin_lock_bh(&sta->plink_lock);
mesh_plink_deactivate(sta); mesh_plink_deactivate(sta);
spin_unlock_bh(&sta->plink_lock);
}
#endif
while ((skb = skb_dequeue(&sta->ps_tx_buf)) != NULL) { while ((skb = skb_dequeue(&sta->ps_tx_buf)) != NULL) {
local->total_ps_buffered--; local->total_ps_buffered--;
......
net/mac80211/sta_info.h
View file @ 902acc78
...@@ -107,7 +107,6 @@ struct tid_ampdu_rx { ...@@ -107,7 +107,6 @@ struct tid_ampdu_rx {
struct timer_list session_timer; struct timer_list session_timer;
}; };
#ifdef CONFIG_MAC80211_MESH
enum plink_state { enum plink_state {
LISTEN, LISTEN,
OPN_SNT, OPN_SNT,
...@@ -117,7 +116,6 @@ enum plink_state { ...@@ -117,7 +116,6 @@ enum plink_state {
HOLDING, HOLDING,
BLOCKED BLOCKED
}; };
#endif
/** /**
* struct sta_ampdu_mlme - STA aggregation information. * struct sta_ampdu_mlme - STA aggregation information.
......
net/mac80211/tx.c
View file @ 902acc78
...@@ -26,9 +26,7 @@ ...@@ -26,9 +26,7 @@
#include "ieee80211_i.h" #include "ieee80211_i.h"
#include "ieee80211_led.h" #include "ieee80211_led.h"
#ifdef CONFIG_MAC80211_MESH
#include "mesh.h" #include "mesh.h"
#endif
#include "wep.h" #include "wep.h"
#include "wpa.h" #include "wpa.h"
#include "wme.h" #include "wme.h"
...@@ -1778,40 +1776,6 @@ static void ieee80211_beacon_add_tim(struct ieee80211_local *local, ...@@ -1778,40 +1776,6 @@ static void ieee80211_beacon_add_tim(struct ieee80211_local *local,
read_unlock_bh(&local->sta_lock); read_unlock_bh(&local->sta_lock);
} }
#ifdef CONFIG_MAC80211_MESH
static struct sk_buff *ieee80211_mesh_beacon_get(struct net_device *dev)
{
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
struct sk_buff *skb = dev_alloc_skb(local->hw.extra_tx_headroom + 400);
struct ieee80211_mgmt *mgmt;
u8 *pos;
if (!skb)
return NULL;
skb_reserve(skb, local->hw.extra_tx_headroom);
mgmt = (struct ieee80211_mgmt *)
skb_put(skb, 24 + sizeof(mgmt->u.beacon));
memset(mgmt, 0, 24 + sizeof(mgmt->u.beacon));
mgmt->frame_control = IEEE80211_FC(IEEE80211_FTYPE_MGMT,
IEEE80211_STYPE_BEACON);
memset(mgmt->da, 0xff, ETH_ALEN);
memcpy(mgmt->sa, dev->dev_addr, ETH_ALEN);
/* BSSID is left zeroed, wildcard value */
mgmt->u.beacon.beacon_int =
cpu_to_le16(local->hw.conf.beacon_int);
mgmt->u.beacon.capab_info = 0x0; /* 0x0 for MPs */
pos = skb_put(skb, 2);
*pos++ = WLAN_EID_SSID;
*pos++ = 0x0;
mesh_mgmt_ies_add(skb, dev);
return skb;
}
#endif
struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
struct ieee80211_vif *vif, struct ieee80211_vif *vif,
struct ieee80211_tx_control *control) struct ieee80211_tx_control *control)
...@@ -1824,8 +1788,10 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, ...@@ -1824,8 +1788,10 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
struct rate_selection rsel; struct rate_selection rsel;
struct beacon_data *beacon; struct beacon_data *beacon;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
struct ieee80211_mgmt *mgmt;
int *num_beacons; int *num_beacons;
int err = 0; bool err = true;
u8 *pos;
sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
...@@ -1834,17 +1800,16 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, ...@@ -1834,17 +1800,16 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
sdata = vif_to_sdata(vif); sdata = vif_to_sdata(vif);
bdev = sdata->dev; bdev = sdata->dev;
switch (sdata->vif.type) { if (sdata->vif.type == IEEE80211_IF_TYPE_AP) {
case IEEE80211_IF_TYPE_AP:
ap = &sdata->u.ap; ap = &sdata->u.ap;
beacon = rcu_dereference(ap->beacon); beacon = rcu_dereference(ap->beacon);
if (!ap || !beacon) { if (ap && beacon) {
err = -1; /*
break; * headroom, head length,
} * tail length and maximum TIM length
*/
/* headroom, head length, tail length and maximum TIM length */ skb = dev_alloc_skb(local->tx_headroom +
skb = dev_alloc_skb(local->tx_headroom + beacon->head_len + beacon->head_len +
beacon->tail_len + 256); beacon->tail_len + 256);
if (!skb) if (!skb)
goto out; goto out;
...@@ -1859,22 +1824,41 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, ...@@ -1859,22 +1824,41 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
ieee80211_beacon_add_tim(local, ap, skb, beacon); ieee80211_beacon_add_tim(local, ap, skb, beacon);
if (beacon->tail) if (beacon->tail)
memcpy(skb_put(skb, beacon->tail_len), beacon->tail, memcpy(skb_put(skb, beacon->tail_len),
beacon->tail_len); beacon->tail, beacon->tail_len);
num_beacons = &ap->num_beacons; num_beacons = &ap->num_beacons;
break;
#ifdef CONFIG_MAC80211_MESH err = false;
case IEEE80211_IF_TYPE_MESH_POINT: }
skb = ieee80211_mesh_beacon_get(bdev); } else if (ieee80211_vif_is_mesh(&sdata->vif)) {
/* headroom, head length, tail length and maximum TIM length */
skb = dev_alloc_skb(local->tx_headroom + 400);
if (!skb)
goto out;
skb_reserve(skb, local->hw.extra_tx_headroom);
mgmt = (struct ieee80211_mgmt *)
skb_put(skb, 24 + sizeof(mgmt->u.beacon));
memset(mgmt, 0, 24 + sizeof(mgmt->u.beacon));
mgmt->frame_control = IEEE80211_FC(IEEE80211_FTYPE_MGMT,
IEEE80211_STYPE_BEACON);
memset(mgmt->da, 0xff, ETH_ALEN);
memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);
/* BSSID is left zeroed, wildcard value */
mgmt->u.beacon.beacon_int =
cpu_to_le16(local->hw.conf.beacon_int);
mgmt->u.beacon.capab_info = 0x0; /* 0x0 for MPs */
pos = skb_put(skb, 2);
*pos++ = WLAN_EID_SSID;
*pos++ = 0x0;
mesh_mgmt_ies_add(skb, sdata->dev);
num_beacons = &sdata->u.sta.num_beacons; num_beacons = &sdata->u.sta.num_beacons;
break;
#endif
default: err = false;
err = -1;
break;
} }
if (err) { if (err) {
......
net/mac80211/util.c
View file @ 902acc78
...@@ -26,9 +26,7 @@ ...@@ -26,9 +26,7 @@
#include "ieee80211_i.h" #include "ieee80211_i.h"
#include "ieee80211_rate.h" #include "ieee80211_rate.h"
#ifdef CONFIG_MAC80211_MESH
#include "mesh.h" #include "mesh.h"
#endif
#include "wme.h" #include "wme.h"
/* privid for wiphys to determine whether they belong to us or not */ /* privid for wiphys to determine whether they belong to us or not */
...@@ -149,7 +147,6 @@ int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb) ...@@ -149,7 +147,6 @@ int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb)
} }
EXPORT_SYMBOL(ieee80211_get_hdrlen_from_skb); EXPORT_SYMBOL(ieee80211_get_hdrlen_from_skb);
#ifdef CONFIG_MAC80211_MESH
int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr) int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
{ {
int ae = meshhdr->flags & IEEE80211S_FLAGS_AE; int ae = meshhdr->flags & IEEE80211S_FLAGS_AE;
...@@ -167,7 +164,6 @@ int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr) ...@@ -167,7 +164,6 @@ int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
return 5; return 5;
} }
} }
#endif
void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx) void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx)
{ {
...@@ -418,31 +414,3 @@ void ieee80211_iterate_active_interfaces( ...@@ -418,31 +414,3 @@ void ieee80211_iterate_active_interfaces(
rcu_read_unlock(); rcu_read_unlock();
} }
EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces); EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces);
#ifdef CONFIG_MAC80211_MESH
/**
* ieee80211_new_mesh_header - create a new mesh header
* @meshhdr: uninitialized mesh header
* @sdata: mesh interface to be used
*
* Return the header length.
*/
int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,
struct ieee80211_sub_if_data *sdata)
{
meshhdr->flags = 0;
meshhdr->ttl = sdata->u.sta.mshcfg.dot11MeshTTL;
meshhdr->seqnum[0] = sdata->u.sta.mesh_seqnum[0]++;
meshhdr->seqnum[1] = sdata->u.sta.mesh_seqnum[1];
meshhdr->seqnum[2] = sdata->u.sta.mesh_seqnum[2];
if (sdata->u.sta.mesh_seqnum[0] == 0) {
sdata->u.sta.mesh_seqnum[1]++;
if (sdata->u.sta.mesh_seqnum[1] == 0)
sdata->u.sta.mesh_seqnum[2]++;
}
return 5;
}
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment