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_urtw.c | |
| 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_urtw.c')
| -rw-r--r-- | sys/dev/usb/wlan/if_urtw.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c index 184317b..4e16579 100644 --- a/sys/dev/usb/wlan/if_urtw.c +++ b/sys/dev/usb/wlan/if_urtw.c @@ -1035,8 +1035,13 @@ urtw_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, return (NULL); vap = &uvp->vap; /* enable s/w bmiss handling for sta mode */ - ieee80211_vap_setup(ic, vap, name, unit, opmode, - flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); + + if (ieee80211_vap_setup(ic, vap, name, unit, opmode, + flags | IEEE80211_CLONE_NOBEACONS, bssid, mac) != 0) { + /* out of memory */ + free(uvp, M_80211_VAP); + return (NULL); + } /* override state transition machine */ uvp->newstate = vap->iv_newstate; @@ -1761,7 +1766,7 @@ urtw_tx_start(struct urtw_softc *sc, struct ieee80211_node *ni, struct mbuf *m0, else dur = URTW_ASIFS_TIME + acktime; } - *(uint16_t *)wh->i_dur = htole16(dur); + USETW(wh->i_dur, dur); xferlen = m0->m_pkthdr.len; xferlen += (sc->sc_flags & URTW_RTL8187B) ? (4 * 8) : (4 * 3); |
