diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-25 00:38:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-25 00:38:24 -0700 |
| commit | 45ea4ea2af358fe316c918381c7868f9418cad09 (patch) | |
| tree | 4deb3d87b26e884b06929fe33740d45e78fbdcab /net/mac80211/sta_info.c | |
| parent | dddc045e2fdd4eb8d7dfac29bff191d639fff8c3 (diff) | |
| parent | a2e2322d83df82a57ba456cfa604c8b8f7b04670 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index a98ea273a15..d5611d8fd0d 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -293,6 +293,9 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata, skb_queue_head_init(&sta->ps_tx_buf); skb_queue_head_init(&sta->tx_filtered); + for (i = 0; i < NUM_RX_DATA_QUEUES; i++) + sta->last_seq_ctrl[i] = cpu_to_le16(USHORT_MAX); + #ifdef CONFIG_MAC80211_VERBOSE_DEBUG printk(KERN_DEBUG "%s: Allocated STA %pM\n", wiphy_name(local->hw.wiphy), sta->sta.addr); @@ -608,6 +611,9 @@ static void sta_info_cleanup(unsigned long data) sta_info_cleanup_expire_buffered(local, sta); rcu_read_unlock(); + if (local->quiescing) + return; + local->sta_cleanup.expires = round_jiffies(jiffies + STA_INFO_CLEANUP_INTERVAL); add_timer(&local->sta_cleanup); |