From fa3711ec9083804ced3e648d500e1bf4e15b5d2a Mon Sep 17 00:00:00 2001
From: Bob Copeland <me@bobcopeland.com>
Date: Wed, 29 Oct 2008 08:30:56 -0400
Subject: [PATCH] --- yaml --- r: 118321 b: refs/heads/master c:
 063279062a8c530cc90fb77797db16c49c905b26 h: refs/heads/master i:   118319:
 f105cb10cc55117a49d94d0d6027966613408888 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/wireless/ath5k/base.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a61d822e7f12..d7a1da1c668a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d19267b8d1e12c0baebf9be96e04cddffe63f67
+refs/heads/master: 063279062a8c530cc90fb77797db16c49c905b26
diff --git a/trunk/drivers/net/wireless/ath5k/base.c b/trunk/drivers/net/wireless/ath5k/base.c
index cfd4d052d666..9e47d727e220 100644
--- a/trunk/drivers/net/wireless/ath5k/base.c
+++ b/trunk/drivers/net/wireless/ath5k/base.c
@@ -2942,10 +2942,8 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
 		sc->opmode != NL80211_IFTYPE_MESH_POINT &&
 		test_bit(ATH_STAT_PROMISC, sc->status))
 		rfilt |= AR5K_RX_FILTER_PROM;
-	if (sc->opmode == NL80211_IFTYPE_STATION ||
-		sc->opmode == NL80211_IFTYPE_ADHOC) {
+	if (sc->opmode == NL80211_IFTYPE_ADHOC)
 		rfilt |= AR5K_RX_FILTER_BEACON;
-	}
 
 	/* Set filters */
 	ath5k_hw_set_rx_filter(ah,rfilt);