etheriwl: use first available antenna from eeprom txantmask instead of hardcode to...

diff --git a/sys/src/9/pc/etheriwl.c b/sys/src/9/pc/etheriwl.c
index e80014debccd04fc5af8ba78ae31b0f4f32db6df..4d49450c6c1ec81af26c6282cc30404228b865d9 100644 (file)
--- a/sys/src/9/pc/etheriwl.c
+++ b/sys/src/9/pc/etheriwl.c
@@ -1725,7 +1725,7 @@ enum {
 static void
 transmit(Wifi *wifi, Wnode *wn, Block *b)
 {
-       int flags, nodeid, rate;
+       int flags, nodeid, rate, ant;
        uchar c[Tcmdsize], *p;
        Ether *edev;
        Ctlr *ctlr;
@@ -1773,6 +1773,11 @@ transmit(Wifi *wifi, Wnode *wn, Block *b)
        }
        qunlock(ctlr);
 
+       /* select first available antenna */
+       ant = ctlr->rfcfg.txantmask & 7;
+       ant |= (ant == 0);
+       ant = ((ant - 1) & ant) ^ ant;
+
        memset(p = c, 0, sizeof(c));
        put16(p, BLEN(b));
        p += 2;
@@ -1783,7 +1788,7 @@ transmit(Wifi *wifi, Wnode *wn, Block *b)
        p += 4;         /* scratch */
 
        *p++ = ratetab[rate].plcp;
-       *p++ = ratetab[rate].flags | (1<<6);
+       *p++ = ratetab[rate].flags | (ant<<6);
 
        p += 2;         /* xflags */
        *p++ = nodeid;