diff --git a/[refs] b/[refs]
index aa47f4bbd970..b29960ed72f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 254ad0ff9387d1c0a2f975ff40b2f4d1302ccc3a
+refs/heads/master: d42c6b71a8e722e00a302e7e3365909560de478a
diff --git a/trunk/drivers/net/wireless/ath9k/recv.c b/trunk/drivers/net/wireless/ath9k/recv.c
index 8da08f9b463c..630fa57f14ed 100644
--- a/trunk/drivers/net/wireless/ath9k/recv.c
+++ b/trunk/drivers/net/wireless/ath9k/recv.c
@@ -372,6 +372,9 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
 		rfilt &= ~ATH9K_RX_FILTER_UCAST;
 	}
 
+	if (sc->rx.rxfilter & FIF_CONTROL)
+		rfilt |= ATH9K_RX_FILTER_CONTROL;
+
 	if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_STATION ||
 	    sc->sc_ah->ah_opmode == NL80211_IFTYPE_ADHOC)
 		rfilt |= ATH9K_RX_FILTER_BEACON;