Revert "mac80211: move "bufferable MMPDU" check to fix AP mode scan"
authorJohannes Berg <johannes.berg@intel.com>
Mon, 7 Jul 2014 10:01:11 +0000 (12:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 7 Aug 2014 23:53:51 +0000 (16:53 -0700)
commit8c0414e0272172f383b6daa4398f0b3a42e3ea0f
treec90b34b9a2f764ce762c4908a858bae7ad25849e
parentc479a8748ab69398fc0587d9ee575c5d0431cef4
Revert "mac80211: move "bufferable MMPDU" check to fix AP mode scan"

commit 08b9939997df30e42a228e1ecb97f99e9c8ea84e upstream.

This reverts commit 277d916fc2e959c3f106904116bb4f7b1148d47a as it was
at least breaking iwlwifi by setting the IEEE80211_TX_CTL_NO_PS_BUFFER
flag in all kinds of interface modes, not only for AP mode where it is
appropriate.

To avoid reintroducing the original problem, explicitly check for probe
request frames in the multicast buffering code.

Fixes: 277d916fc2e9 ("mac80211: move "bufferable MMPDU" check to fix AP mode scan")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/mac80211/tx.c