diff options
| author | hselasky <hselasky@FreeBSD.org> | 2013-12-16 08:10:38 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2013-12-16 08:10:38 +0000 |
| commit | 4d2c5784a59d46eee8603e58fb0cb640eeaefea0 (patch) | |
| tree | 2f0bb987f30d5fd0d9513e01d3a1567aeff9ce6e /sys/dev/usb/wlan/if_runvar.h | |
| parent | a12532878ede59447568dc8dfcd6f4f24981a51c (diff) | |
| download | FreeBSD-src-4d2c5784a59d46eee8603e58fb0cb640eeaefea0.zip FreeBSD-src-4d2c5784a59d46eee8603e58fb0cb640eeaefea0.tar.gz | |
MFC r238274, r246752, r256720, r256721, r256722, r256955, r257409
r257429, r257435, r257712, r257732, r257743, r257748, r257955
r257957, r257958, r258082, r258641, r258643, r258732, r258733,
r258840, r258919, r258921, r259029, r259030, r259031, r259032 and r259046:
- Add support for the MediaTek/Ralink RT5370/RT5372 chipset.
- Various minor USB WLAN fixes and improvements.
PR: usb/182936
Diffstat (limited to 'sys/dev/usb/wlan/if_runvar.h')
| -rw-r--r-- | sys/dev/usb/wlan/if_runvar.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sys/dev/usb/wlan/if_runvar.h b/sys/dev/usb/wlan/if_runvar.h index 37ae3fa..cc6f44c 100644 --- a/sys/dev/usb/wlan/if_runvar.h +++ b/sys/dev/usb/wlan/if_runvar.h @@ -25,17 +25,11 @@ #define RUN_MAX_RXSZ \ MIN(4096, MJUMPAGESIZE) -#if 0 - (sizeof (uint32_t) + \ - sizeof (struct rt2860_rxwi) + \ - sizeof (uint16_t) + \ - MCLBYTES + \ - sizeof (struct rt2870_rxd)) -#endif + /* NB: "11" is the maximum number of padding bytes needed for Tx */ #define RUN_MAX_TXSZ \ (sizeof (struct rt2870_txd) + \ - sizeof (struct rt2860_rxwi) + \ + sizeof (struct rt2860_txwi) + \ MCLBYTES + 11) #define RUN_TX_TIMEOUT 5000 /* ms */ @@ -170,7 +164,7 @@ struct run_softc { uint16_t mac_ver; uint16_t mac_rev; - uint8_t rf_rev; + uint16_t rf_rev; uint8_t freq; uint8_t ntxchains; uint8_t nrxchains; |
