diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-06 22:34:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-06 22:34:15 +0200 |
| commit | a25a32ab71f822efb3e6025c365caa678aa6ff3b (patch) | |
| tree | fcbc495baddf6d1837034cb83ee837887ea648f6 /net | |
| parent | dsa/mv88e6131: add support for mv88e6085 switch (diff) | |
| parent | iwlwifi: accept EEPROM version 0x423 for iwl6000 (diff) | |
| download | linux-a25a32ab71f822efb3e6025c365caa678aa6ff3b.tar.xz linux-a25a32ab71f822efb3e6025c365caa678aa6ff3b.zip | |
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/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index aa5cc37b4921..2afeac9c6453 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2541,7 +2541,6 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx) * same TID from the same station */ rx->skb = skb; - rx->flags = 0; CALL_RXH(ieee80211_rx_h_decrypt) CALL_RXH(ieee80211_rx_h_check_more_data) @@ -2612,6 +2611,7 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid) .sdata = sta->sdata, .local = sta->local, .queue = tid, + .flags = 0, }; struct tid_ampdu_rx *tid_agg_rx; |