diff --git a/[refs] b/[refs] index f4528a1d88f1..a3ad0f50dd69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e78c9d285709f535caae405f1da5b2936f51f0b5 +refs/heads/master: 8b6bbe75384417d3f5edafcb45d2f67415e9cc00 diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c index 1ccd32933eb7..d44c87269bcb 100644 --- a/trunk/net/mac80211/rx.c +++ b/trunk/net/mac80211/rx.c @@ -1972,7 +1972,7 @@ static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local, goto end_reorder; /* null data frames are excluded */ - if (unlikely(fc & IEEE80211_STYPE_QOS_NULLFUNC)) + if (unlikely(fc & IEEE80211_STYPE_NULLFUNC)) goto end_reorder; /* new un-ordered ampdu frame - process it */