diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-22 17:36:18 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-22 17:36:18 -0400 |
| commit | db138908ccff404b9920f18f6244f4bff2368c04 (patch) | |
| tree | 18734f9b833a5f1134fc138a00d9223fc2afa028 /net | |
| parent | 04024b937a6e9b7d4320b5853557cea3930d528c (diff) | |
| parent | 8bc8aecdc5e26cfda12dbd6867af4aa67836da6a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/sta_info.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 5a11078827ab..d0311a322ddd 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c | |||
| @@ -243,6 +243,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata, | |||
| 243 | memcpy(sta->sta.addr, addr, ETH_ALEN); | 243 | memcpy(sta->sta.addr, addr, ETH_ALEN); |
| 244 | sta->local = local; | 244 | sta->local = local; |
| 245 | sta->sdata = sdata; | 245 | sta->sdata = sdata; |
| 246 | sta->last_rx = jiffies; | ||
| 246 | 247 | ||
| 247 | ewma_init(&sta->avg_signal, 1024, 8); | 248 | ewma_init(&sta->avg_signal, 1024, 8); |
| 248 | 249 | ||