lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: mesh data structures and first mesh changes

Browse Source 
Includes integration in struct sta_info of mesh peer link elements, previously
on their own mesh peer link table.

Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis Carlos Cobo
2008-02-23 15:17:11 +01:00
committed by John W. Linville
parent 33b64eb2b1
commit ee3858551a
10 changed files with 394 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
net/mac80211/sta_info.c
View File

@@ -21,6 +21,9 @@
#include "ieee80211_rate.h"
#include "sta_info.h"
#include "debugfs_sta.h"
#ifdef CONFIG_MAC80211_MESH
#include "mesh.h"
#endif
/* Caller must hold local->sta_lock */
static void sta_info_hash_add(struct ieee80211_local *local,
@@ -84,6 +87,27 @@ struct sta_info *sta_info_get(struct ieee80211_local *local, u8 *addr)
}
EXPORT_SYMBOL(sta_info_get);
struct sta_info *sta_info_get_by_idx(struct ieee80211_local *local, int idx,
struct net_device *dev)
{
struct sta_info *sta;
int i = 0;
read_lock_bh(&local->sta_lock);
list_for_each_entry(sta, &local->sta_list, list) {
if (i < idx) {
++i;
continue;
} else if (!dev || dev == sta->dev) {
__sta_info_get(sta);
read_unlock_bh(&local->sta_lock);
return sta;
}
}
read_unlock_bh(&local->sta_lock);
return NULL;
}
static void sta_info_release(struct kref *kref)
{
@@ -284,12 +308,19 @@ void sta_info_remove(struct sta_info *sta)
__sta_info_clear_tim_bit(sdata->bss, sta);
}
local->num_sta--;
#ifdef CONFIG_MAC80211_MESH
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT)
mesh_accept_plinks_update(sdata->dev);
#endif
}
void sta_info_free(struct sta_info *sta)
{
struct sk_buff *skb;
struct ieee80211_local *local = sta->local;
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
DECLARE_MAC_BUF(mac);
might_sleep();
@@ -298,6 +329,14 @@ void sta_info_free(struct sta_info *sta)
sta_info_remove(sta);
write_unlock_bh(&local->sta_lock);
#ifdef CONFIG_MAC80211_MESH
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) {
spin_lock_bh(&sta->plink_lock);
mesh_plink_deactivate(sta);
spin_unlock_bh(&sta->plink_lock);
}
#endif
while ((skb = skb_dequeue(&sta->ps_tx_buf)) != NULL) {
local->total_ps_buffered--;
dev_kfree_skb(skb);
@@ -315,9 +354,6 @@ void sta_info_free(struct sta_info *sta)
WARN_ON(sta->key);
if (local->ops->sta_notify) {
struct ieee80211_sub_if_data *sdata;
sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
if (sdata->vif.type == IEEE80211_IF_TYPE_VLAN)
sdata = sdata->u.vlan.ap;