diff options
| author | kevlo <kevlo@FreeBSD.org> | 2015-10-04 13:39:00 +0000 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2015-10-04 13:39:00 +0000 |
| commit | 0a35394352600b45805273e0e422d18a64ca7378 (patch) | |
| tree | f4e797a080354faed0e3a8abbfd7e9a84ae5f6b6 /sys/dev | |
| parent | 299782142149f689011ed5e86253c44452a99f1d (diff) | |
| download | FreeBSD-src-0a35394352600b45805273e0e422d18a64ca7378.zip FreeBSD-src-0a35394352600b45805273e0e422d18a64ca7378.tar.gz | |
Fix max TX power settings for RT5390/RT5392.
While here remove wrong definition of RT2860_USB_PHY_MAN_RST.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/wlan/if_run.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_runreg.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c index fe9d477..83d4a88 100644 --- a/sys/dev/usb/wlan/if_run.c +++ b/sys/dev/usb/wlan/if_run.c @@ -1692,14 +1692,14 @@ run_get_txpower(struct run_softc *sc) /* Fix broken Tx power entries. */ for (i = 0; i < 14; i++) { if (sc->mac_ver >= 0x5390) { - if (sc->txpow1[i] < 0 || sc->txpow1[i] > 27) + if (sc->txpow1[i] < 0 || sc->txpow1[i] > 39) sc->txpow1[i] = 5; } else { if (sc->txpow1[i] < 0 || sc->txpow1[i] > 31) sc->txpow1[i] = 5; } if (sc->mac_ver > 0x5390) { - if (sc->txpow2[i] < 0 || sc->txpow2[i] > 27) + if (sc->txpow2[i] < 0 || sc->txpow2[i] > 39) sc->txpow2[i] = 5; } else if (sc->mac_ver < 0x5390) { if (sc->txpow2[i] < 0 || sc->txpow2[i] > 31) diff --git a/sys/dev/usb/wlan/if_runreg.h b/sys/dev/usb/wlan/if_runreg.h index aa54a72..de71d5a 100644 --- a/sys/dev/usb/wlan/if_runreg.h +++ b/sys/dev/usb/wlan/if_runreg.h @@ -274,7 +274,6 @@ #define RT2860_USB_TXOP_HALT (1 << 20) #define RT2860_USB_TX_CLEAR (1 << 19) #define RT2860_USB_PHY_WD_EN (1 << 16) -#define RT2860_USB_PHY_MAN_RST (1 << 15) #define RT2860_USB_RX_AGG_LMT(x) ((x) << 8) /* in unit of 1KB */ #define RT2860_USB_RX_AGG_TO(x) ((x) & 0xff) /* in unit of 33ns */ |
