diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-14 12:29:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-14 12:29:17 -0700 |
| commit | a8519de4a030d130e0d18147a2af3112b7951e0b (patch) | |
| tree | 59f89418cf7f311d896c38ff774398e052b709d8 /net/mac80211/cfg.c | |
| parent | 5c16807d3d196203d2d3c9fae51ac7e422091904 (diff) | |
| parent | 560ad81b6c90e0fddc4d6c280f16ddf18d47eeb1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 4bbf5007799..5608f6c6841 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -323,6 +323,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) { struct ieee80211_sub_if_data *sdata = sta->sdata; + sinfo->generation = sdata->local->sta_generation; + sinfo->filled = STATION_INFO_INACTIVE_TIME | STATION_INFO_RX_BYTES | STATION_INFO_TX_BYTES | @@ -909,6 +911,8 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, else memset(next_hop, 0, ETH_ALEN); + pinfo->generation = mesh_paths_generation; + pinfo->filled = MPATH_INFO_FRAME_QLEN | MPATH_INFO_DSN | MPATH_INFO_METRIC | |