Date: Sun, 4 Oct 2015 13:39:01 +0000 (UTC) From: Kevin Lo <kevlo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288666 - head/sys/dev/usb/wlan Message-ID: <201510041339.t94Dd1jq034218@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevlo Date: Sun Oct 4 13:39:00 2015 New Revision: 288666 URL: https://svnweb.freebsd.org/changeset/base/288666 Log: Fix max TX power settings for RT5390/RT5392. While here remove wrong definition of RT2860_USB_PHY_MAN_RST. Modified: head/sys/dev/usb/wlan/if_run.c head/sys/dev/usb/wlan/if_runreg.h Modified: head/sys/dev/usb/wlan/if_run.c ============================================================================== --- head/sys/dev/usb/wlan/if_run.c Sun Oct 4 12:52:30 2015 (r288665) +++ head/sys/dev/usb/wlan/if_run.c Sun Oct 4 13:39:00 2015 (r288666) @@ -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) Modified: head/sys/dev/usb/wlan/if_runreg.h ============================================================================== --- head/sys/dev/usb/wlan/if_runreg.h Sun Oct 4 12:52:30 2015 (r288665) +++ head/sys/dev/usb/wlan/if_runreg.h Sun Oct 4 13:39:00 2015 (r288666) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510041339.t94Dd1jq034218>