merge r16846 to 8.09

SVN-Revision: 16847

diff --git a/package/madwifi/patches/420-diversity_fix.patch b/package/madwifi/patches/420-diversity_fix.patch
index bfb4f7620c42cd23afe8c29e88a3dd4652935a92..8fc0ee78958d1d1ee7086518b3cd5252df04cb1f 100644 (file)
--- a/package/madwifi/patches/420-diversity_fix.patch
+++ b/package/madwifi/patches/420-diversity_fix.patch
@@ -61,7 +61,7 @@
 -      /* XXX block beacon interrupts */
 -      ath_hal_setdiversity(ah, (sc->sc_diversity != 0));
        ath_hal_setdefantenna(ah, antenna);
-+      ath_hal_setantennaswitch(ah, sc->sc_diversity ? 0 : sc->sc_defant);
++      ath_hal_setantennaswitch(ah, sc->sc_diversity ? 0 : antenna);
        if (sc->sc_defant != antenna)
                sc->sc_stats.ast_ant_defswitch++;
        sc->sc_defant = antenna;