diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-01 14:19:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-01 14:19:22 -0400 |
| commit | af3e09e666428f9493e0dd309e0f2ac8480cde8a (patch) | |
| tree | 8322bc0a03372a87f47630f78be8a63de7b791aa /net/mac80211/rx.c | |
| parent | 9c026424dbdb89e2cef9962562cbfd576b293d29 (diff) | |
| parent | 788211d81bfdf9b6a547d0530f206ba6ee76b107 (diff) | |
| download | lwn-af3e09e666428f9493e0dd309e0f2ac8480cde8a.tar.gz lwn-af3e09e666428f9493e0dd309e0f2ac8480cde8a.zip | |
Merge tag 'mac80211-for-davem-2015-04-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
This contains just a single fix for a crash I happened to randomly
run into today during testing. It's clearly been around for a while,
but is pretty hard to trigger, even when I tried explicitly (and
modified the code to make it more likely) it rarely did.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 944bdc04e913..1eb730bf8752 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -873,9 +873,10 @@ static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata, set_release_timer: - mod_timer(&tid_agg_rx->reorder_timer, - tid_agg_rx->reorder_time[j] + 1 + - HT_RX_REORDER_BUF_TIMEOUT); + if (!tid_agg_rx->removed) + mod_timer(&tid_agg_rx->reorder_timer, + tid_agg_rx->reorder_time[j] + 1 + + HT_RX_REORDER_BUF_TIMEOUT); } else { del_timer(&tid_agg_rx->reorder_timer); } |