diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-19 16:17:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-19 16:17:12 -0700 |
| commit | d950f264ff7260d8c1e124158d758db13e1ad2d0 (patch) | |
| tree | 8a8758af70d72b94e51609a5088a5739d00d8793 /net/mac80211/mesh_pathtbl.c | |
| parent | 04da2cf9bb133355b7073be25ef3ce88c8edc135 (diff) | |
| parent | 375da53b8e5e3ff2330b66b377e07a6151a93fe5 (diff) | |
| download | kernel-crypto-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.gz kernel-crypto-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.xz kernel-crypto-d950f264ff7260d8c1e124158d758db13e1ad2d0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/mesh_pathtbl.c')
| -rw-r--r-- | net/mac80211/mesh_pathtbl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 0a60f55f32a..e4fa2905fad 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c @@ -153,7 +153,7 @@ int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata) if (is_multicast_ether_addr(dst)) return -ENOTSUPP; - if (atomic_add_unless(&sdata->u.sta.mpaths, 1, MESH_MAX_MPATHS) == 0) + if (atomic_add_unless(&sdata->u.mesh.mpaths, 1, MESH_MAX_MPATHS) == 0) return -ENOSPC; err = -ENOMEM; @@ -221,7 +221,7 @@ err_exists: err_node_alloc: kfree(new_mpath); err_path_alloc: - atomic_dec(&sdata->u.sta.mpaths); + atomic_dec(&sdata->u.mesh.mpaths); return err; } @@ -306,7 +306,7 @@ static void mesh_path_node_reclaim(struct rcu_head *rp) struct ieee80211_sub_if_data *sdata = node->mpath->sdata; del_timer_sync(&node->mpath->timer); - atomic_dec(&sdata->u.sta.mpaths); + atomic_dec(&sdata->u.mesh.mpaths); kfree(node->mpath); kfree(node); } @@ -401,7 +401,7 @@ void mesh_path_discard_frame(struct sk_buff *skb, } kfree_skb(skb); - sdata->u.sta.mshstats.dropped_frames_no_route++; + sdata->u.mesh.mshstats.dropped_frames_no_route++; } /** |