Hi Dave,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/ath5k/base.c between commit
934f6c3f8e7f5d6a6d07ae2df283fd02393019dd ("Revert "ath5k: honor
FIF_BCN_PRBRESP_PROMISC in STA mode"") from the net-current tree and
commit b706e65b40417e03c2451bb3f92488f3736843fa ("ath5k: fix mesh point
operation") from the net tree.
Just a context change. I fixed it up (see below) and assume it will be
fixed in your tree soon.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/net/wireless/ath5k/base.c
index cfd4d05,7ac5f28..0000000
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@@ -2942,13 -2949,14 +2949,16 @@@ static void ath5k_configure_filter(stru
sc->opmode != NL80211_IFTYPE_MESH_POINT &&
test_bit(ATH_STAT_PROMISC, sc->status))
rfilt |= AR5K_RX_FILTER_PROM;
- if (sc->opmode == NL80211_IFTYPE_ADHOC)
+ if (sc->opmode == NL80211_IFTYPE_STATION ||
+ sc->opmode == NL80211_IFTYPE_ADHOC) {
rfilt |= AR5K_RX_FILTER_BEACON;
+ }
+ if (sc->opmode == NL80211_IFTYPE_MESH_POINT)
+ rfilt |= AR5K_RX_FILTER_CONTROL | AR5K_RX_FILTER_BEACON |
+ AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM;
/* Set filters */
- ath5k_hw_set_rx_filter(ah,rfilt);
+ ath5k_hw_set_rx_filter(ah, rfilt);
/* Set multicast bits */
ath5k_hw_set_mcast_filter(ah, mfilt[0], mfilt[1]);
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
