aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-04-07 16:13:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-04-07 16:13:25 +0000
commit912fb776e42b7d1f17fb5e3012ce0db24a9aa21f (patch)
treedc4623a1dc94218767fdd7b46053457b16f21fb2
parent47387c945a9bd5d560070fe181e0b69336ef8be0 (diff)
downloadupstream-912fb776e42b7d1f17fb5e3012ce0db24a9aa21f.tar.gz
upstream-912fb776e42b7d1f17fb5e3012ce0db24a9aa21f.tar.bz2
upstream-912fb776e42b7d1f17fb5e3012ce0db24a9aa21f.zip
madwifi: remove braindead code that overwrote the user's antenna diversity setting (thx, brainslayer)
SVN-Revision: 15141
-rw-r--r--package/madwifi/patches/420-diversity_fix.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/package/madwifi/patches/420-diversity_fix.patch b/package/madwifi/patches/420-diversity_fix.patch
new file mode 100644
index 0000000000..b7d26d976d
--- /dev/null
+++ b/package/madwifi/patches/420-diversity_fix.patch
@@ -0,0 +1,30 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -5344,27 +5344,6 @@ ath_beacon_send(struct ath_softc *sc, in
+ } else if ((sc->sc_updateslot == COMMIT) && (sc->sc_slotupdate == slot))
+ ath_setslottime(sc); /* commit change to hardware */
+
+- if ((!sc->sc_stagbeacons || slot == 0) && (!sc->sc_diversity)) {
+- unsigned int otherant;
+- /*
+- * Check recent per-antenna transmit statistics and flip
+- * the default rx antenna if noticeably more frames went out
+- * on the non-default antenna. Only do this if rx diversity
+- * is off.
+- * XXX assumes 2 antennae
+- */
+- otherant = sc->sc_defant & 1 ? 2 : 1;
+- if (sc->sc_ant_tx[otherant] > sc->sc_ant_tx[sc->sc_defant] +
+- ATH_ANTENNA_DIFF) {
+- DPRINTF(sc, ATH_DEBUG_BEACON,
+- "Flip default antenna to %u, %u > %u\n",
+- otherant, sc->sc_ant_tx[otherant],
+- sc->sc_ant_tx[sc->sc_defant]);
+- ath_setdefantenna(sc, otherant);
+- }
+- sc->sc_ant_tx[1] = sc->sc_ant_tx[2] = 0;
+- }
+-
+ if (bfaddr != 0) {
+ /*
+ * Stop any current DMA and put the new frame(s) on the queue.