summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-23 00:36:18 +0300
committerDavid S. Miller <davem@davemloft.net>2011-03-23 00:36:18 +0300
commitdb138908ccff404b9920f18f6244f4bff2368c04 (patch)
tree18734f9b833a5f1134fc138a00d9223fc2afa028 /net
parent04024b937a6e9b7d4320b5853557cea3930d528c (diff)
parent8bc8aecdc5e26cfda12dbd6867af4aa67836da6a (diff)
downloadlinux-db138908ccff404b9920f18f6244f4bff2368c04.tar.xz
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.c1
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,
memcpy(sta->sta.addr, addr, ETH_ALEN);
sta->local = local;
sta->sdata = sdata;
+ sta->last_rx = jiffies;
ewma_init(&sta->avg_signal, 1024, 8);