Page MenuHomeFreeBSD
Differential D5198

urtwn: shutdown the device properly
ClosedPublic
Actions

Authored by avos on Feb 4 2016, 9:03 PM.
Tags
None
Referenced Files
Unknown Object (File)
Jan 30 2025, 6:46 AM
Unknown Object (File)
Jan 9 2025, 4:11 AM
Unknown Object (File)
Jan 7 2025, 4:43 PM
Unknown Object (File)
Nov 29 2024, 8:09 PM
Unknown Object (File)
Oct 17 2024, 7:01 PM
Unknown Object (File)
Oct 1 2024, 5:30 AM
Unknown Object (File)
Sep 29 2024, 11:26 PM
Unknown Object (File)
Sep 22 2024, 12:57 AM
View All 69 Files
Subscribers
imp

Details

Reviewers
kevlo
adrian
Commits
rS295874: urtwn: shutdown the device properly
Summary

Obtained from:

  • R92C path: NetBSD (mostly);
  • R88E path: TP-Link driver.

P.S. Should be applied on top of D4849 (conflict in urtwn_stop()).

Test Plan

Tested with RTL8188EU and RTL8188CUS.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

avos updated this revision to Diff 13027.Feb 4 2016, 9:03 PM
avos retitled this revision from to urtwn: shutdown the device properly.
avos updated this object.
avos edited the test plan for this revision. (Show Details)
avos added reviewers: adrian, kevlo.
avos set the repository for this revision to rS FreeBSD src repository - subversion.
Herald added a subscriber: imp. · View Herald TranscriptFeb 4 2016, 9:03 PM
adrian accepted this revision.Feb 4 2016, 9:06 PM
adrian edited edge metadata.

I'd want to see more wide scale testing of this, but sure, commit it and then ask people to report any regressions.

This revision is now accepted and ready to land.Feb 4 2016, 9:06 PM
kevlo accepted this revision.Feb 21 2016, 9:00 AM
kevlo edited edge metadata.
Closed by commit rS295874: urtwn: shutdown the device properly (authored by avos). · Explain WhyFeb 22 2016, 1:15 AM
This revision was automatically updated to reflect the committed changes.
avos added a comment.Feb 22 2016, 1:22 AM

Few '#ifndef URTWN_WITHOUT_UCODE' were added to make it work with 'options URTWN_WITHOUT_UCODE'

Revision Contents
Changeset List

PathSize
sys/
dev/
usb/
wlan/
268 lines
25 lines
1 line

Diff 13027

View Options

sys/dev/usb/wlan/if_urtwn.c

Show First 20 Lines • Show All 2,841 Lines • ▼ Show 20 Linesrun_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen)
} }
ant = run_maxrssi_chain(sc, rxwi); ant = run_maxrssi_chain(sc, rxwi);
rssi = rxwi->rssi[ant]; rssi = rxwi->rssi[ant];
nf = run_rssi2dbm(sc, rssi, ant); nf = run_rssi2dbm(sc, rssi, ant);
m->m_pkthdr.len = m->m_len = len; m->m_pkthdr.len = m->m_len = len;
if (ni != NULL) {
(void)ieee80211_input(ni, m, rssi, nf);
ieee80211_free_node(ni);
} else {
(void)ieee80211_input_all(ic, m, rssi, nf);
}
if (__predict_false(ieee80211_radiotap_active(ic))) { if (__predict_false(ieee80211_radiotap_active(ic))) {
struct run_rx_radiotap_header *tap = &sc->sc_rxtap; struct run_rx_radiotap_header *tap = &sc->sc_rxtap;
uint16_t phy; uint16_t phy;
tap->wr_flags = 0; tap->wr_flags = 0;
tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags);
tap->wr_antsignal = rssi; tap->wr_antsignal = rssi;
Show All 21 Lines case RT2860_PHY_OFDM:
case 3: tap->wr_rate = 36; break; case 3: tap->wr_rate = 36; break;
case 4: tap->wr_rate = 48; break; case 4: tap->wr_rate = 48; break;
case 5: tap->wr_rate = 72; break; case 5: tap->wr_rate = 72; break;
case 6: tap->wr_rate = 96; break; case 6: tap->wr_rate = 96; break;
case 7: tap->wr_rate = 108; break; case 7: tap->wr_rate = 108; break;
} }
break; break;
} }
}
if (ni != NULL) {
(void)ieee80211_input(ni, m, rssi, nf);
ieee80211_free_node(ni);
} else {
(void)ieee80211_input_all(ic, m, rssi, nf);
} }
} }
static void static void
run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
{ {
struct run_softc *sc = usbd_xfer_softc(xfer); struct run_softc *sc = usbd_xfer_softc(xfer);
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
▲ Show 20 Lines • Show All 3,372 Lines • Show Last 20 Lines
View Options

sys/dev/usb/wlan/if_urtwnreg.h

Show First 20 Lines • Show All 2,841 Lines • ▼ Show 20 Linesrun_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen)
} }
ant = run_maxrssi_chain(sc, rxwi); ant = run_maxrssi_chain(sc, rxwi);
rssi = rxwi->rssi[ant]; rssi = rxwi->rssi[ant];
nf = run_rssi2dbm(sc, rssi, ant); nf = run_rssi2dbm(sc, rssi, ant);
m->m_pkthdr.len = m->m_len = len; m->m_pkthdr.len = m->m_len = len;
if (ni != NULL) {
(void)ieee80211_input(ni, m, rssi, nf);
ieee80211_free_node(ni);
} else {
(void)ieee80211_input_all(ic, m, rssi, nf);
}
if (__predict_false(ieee80211_radiotap_active(ic))) { if (__predict_false(ieee80211_radiotap_active(ic))) {
struct run_rx_radiotap_header *tap = &sc->sc_rxtap; struct run_rx_radiotap_header *tap = &sc->sc_rxtap;
uint16_t phy; uint16_t phy;
tap->wr_flags = 0; tap->wr_flags = 0;
tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags);
tap->wr_antsignal = rssi; tap->wr_antsignal = rssi;
Show All 21 Lines case RT2860_PHY_OFDM:
case 3: tap->wr_rate = 36; break; case 3: tap->wr_rate = 36; break;
case 4: tap->wr_rate = 48; break; case 4: tap->wr_rate = 48; break;
case 5: tap->wr_rate = 72; break; case 5: tap->wr_rate = 72; break;
case 6: tap->wr_rate = 96; break; case 6: tap->wr_rate = 96; break;
case 7: tap->wr_rate = 108; break; case 7: tap->wr_rate = 108; break;
} }
break; break;
} }
}
if (ni != NULL) {
(void)ieee80211_input(ni, m, rssi, nf);
ieee80211_free_node(ni);
} else {
(void)ieee80211_input_all(ic, m, rssi, nf);
} }
} }
static void static void
run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
{ {
struct run_softc *sc = usbd_xfer_softc(xfer); struct run_softc *sc = usbd_xfer_softc(xfer);
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
▲ Show 20 Lines • Show All 3,372 Lines • Show Last 20 Lines
View Options

sys/dev/usb/wlan/if_urtwnvar.h

Show First 20 Lines • Show All 2,841 Lines • ▼ Show 20 Linesrun_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen)
} }
ant = run_maxrssi_chain(sc, rxwi); ant = run_maxrssi_chain(sc, rxwi);
rssi = rxwi->rssi[ant]; rssi = rxwi->rssi[ant];
nf = run_rssi2dbm(sc, rssi, ant); nf = run_rssi2dbm(sc, rssi, ant);
m->m_pkthdr.len = m->m_len = len; m->m_pkthdr.len = m->m_len = len;
if (ni != NULL) {
(void)ieee80211_input(ni, m, rssi, nf);
ieee80211_free_node(ni);
} else {
(void)ieee80211_input_all(ic, m, rssi, nf);
}
if (__predict_false(ieee80211_radiotap_active(ic))) { if (__predict_false(ieee80211_radiotap_active(ic))) {
struct run_rx_radiotap_header *tap = &sc->sc_rxtap; struct run_rx_radiotap_header *tap = &sc->sc_rxtap;
uint16_t phy; uint16_t phy;
tap->wr_flags = 0; tap->wr_flags = 0;
tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags);
tap->wr_antsignal = rssi; tap->wr_antsignal = rssi;
Show All 21 Lines case RT2860_PHY_OFDM:
case 3: tap->wr_rate = 36; break; case 3: tap->wr_rate = 36; break;
case 4: tap->wr_rate = 48; break; case 4: tap->wr_rate = 48; break;
case 5: tap->wr_rate = 72; break; case 5: tap->wr_rate = 72; break;
case 6: tap->wr_rate = 96; break; case 6: tap->wr_rate = 96; break;
case 7: tap->wr_rate = 108; break; case 7: tap->wr_rate = 108; break;
} }
break; break;
} }
}
if (ni != NULL) {
(void)ieee80211_input(ni, m, rssi, nf);
ieee80211_free_node(ni);
} else {
(void)ieee80211_input_all(ic, m, rssi, nf);
} }
} }
static void static void
run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
{ {
struct run_softc *sc = usbd_xfer_softc(xfer); struct run_softc *sc = usbd_xfer_softc(xfer);
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
▲ Show 20 Lines • Show All 3,372 Lines • Show Last 20 Lines