aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/net/if_cdce.c1
-rw-r--r--sys/dev/usb/net/if_urndis.c3
-rw-r--r--sys/dev/usb/usb_busdma.c8
-rw-r--r--sys/dev/usb/wlan/if_rum.c28
-rw-r--r--sys/dev/usb/wlan/if_rumvar.h1
-rw-r--r--sys/dev/usb/wlan/if_run.c36
-rw-r--r--sys/dev/usb/wlan/if_urtwn.c23
7 files changed, 25 insertions, 75 deletions
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index 13fca9359f2b..397c4f6c779e 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -1535,6 +1535,7 @@ cdce_ncm_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
/* check if we have a buffer */
if (m) {
+ m->m_len = m->m_pkthdr.len = temp + ETHER_ALIGN;
m_adj(m, ETHER_ALIGN);
usbd_copy_out(pc, offset, m->m_data, temp);
diff --git a/sys/dev/usb/net/if_urndis.c b/sys/dev/usb/net/if_urndis.c
index 3c24dcf1d4d7..32fa53370946 100644
--- a/sys/dev/usb/net/if_urndis.c
+++ b/sys/dev/usb/net/if_urndis.c
@@ -884,7 +884,7 @@ urndis_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
DPRINTF("invalid ethernet size "
"%u < %u\n", msg.rm_datalen, (unsigned)sizeof(struct ether_header));
goto tr_setup;
- } else if (msg.rm_datalen > (uint32_t)MCLBYTES) {
+ } else if (msg.rm_datalen > (uint32_t)(MCLBYTES - ETHER_ALIGN)) {
if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
DPRINTF("invalid ethernet size "
"%u > %u\n",
@@ -898,6 +898,7 @@ urndis_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
/* check if we have a buffer */
if (m != NULL) {
+ m->m_len = m->m_pkthdr.len = msg.rm_datalen + ETHER_ALIGN;
m_adj(m, ETHER_ALIGN);
usbd_copy_out(pc, offset + msg.rm_dataoffset +
diff --git a/sys/dev/usb/usb_busdma.c b/sys/dev/usb/usb_busdma.c
index 1c3628888ba8..d9c198774f7a 100644
--- a/sys/dev/usb/usb_busdma.c
+++ b/sys/dev/usb/usb_busdma.c
@@ -443,9 +443,13 @@ usb_pc_common_mem_cb(void *arg, bus_dma_segment_t *segs,
pc->page_offset_buf = rem;
pc->page_offset_end += rem;
#ifdef USB_DEBUG
- if (rem != (USB_P2U(pc->buffer) & (USB_PAGE_SIZE - 1))) {
+ if (nseg > 1 &&
+ ((segs->ds_addr + segs->ds_len) & (USB_PAGE_SIZE - 1)) !=
+ ((segs + 1)->ds_addr & (USB_PAGE_SIZE - 1))) {
/*
- * This check verifies that the physical address is correct:
+ * This check verifies there is no page offset hole
+ * between the first and second segment. See the
+ * BUS_DMA_KEEP_PG_OFFSET flag.
*/
DPRINTFN(0, "Page offset was not preserved\n");
error = 1;
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c
index de7b8806e800..9d2203da5494 100644
--- a/sys/dev/usb/wlan/if_rum.c
+++ b/sys/dev/usb/wlan/if_rum.c
@@ -216,8 +216,6 @@ static void rum_get_tsf(struct rum_softc *, uint64_t *);
static void rum_update_slot_cb(struct rum_softc *,
union sec_param *, uint8_t);
static void rum_update_slot(struct ieee80211com *);
-static void rum_wme_update_cb(struct rum_softc *,
- union sec_param *, uint8_t);
static int rum_wme_update(struct ieee80211com *);
static void rum_set_bssid(struct rum_softc *, const uint8_t *);
static void rum_set_macaddr(struct rum_softc *, const uint8_t *);
@@ -2083,14 +2081,15 @@ rum_update_slot(struct ieee80211com *ic)
rum_cmd_sleepable(ic->ic_softc, NULL, 0, 0, rum_update_slot_cb);
}
-static void
-rum_wme_update_cb(struct rum_softc *sc, union sec_param *data, uint8_t rvp_id)
+static int
+rum_wme_update(struct ieee80211com *ic)
{
- struct ieee80211com *ic = &sc->sc_ic;
const struct wmeParams *chanp =
ic->ic_wme.wme_chanParams.cap_wmeParams;
+ struct rum_softc *sc = ic->ic_softc;
int error = 0;
+ RUM_LOCK(sc);
error = rum_write(sc, RT2573_AIFSN_CSR,
chanp[WME_AC_VO].wmep_aifsn << 12 |
chanp[WME_AC_VI].wmep_aifsn << 8 |
@@ -2125,21 +2124,14 @@ rum_wme_update_cb(struct rum_softc *sc, union sec_param *data, uint8_t rvp_id)
memcpy(sc->wme_params, chanp, sizeof(*chanp) * WME_NUM_AC);
- return;
-
print_err:
- device_printf(sc->sc_dev, "%s: WME update failed, error %d\n",
- __func__, error);
-}
-
-static int
-rum_wme_update(struct ieee80211com *ic)
-{
- struct rum_softc *sc = ic->ic_softc;
-
- rum_cmd_sleepable(sc, NULL, 0, 0, rum_wme_update_cb);
+ RUM_UNLOCK(sc);
+ if (error != 0) {
+ device_printf(sc->sc_dev, "%s: WME update failed, error %d\n",
+ __func__, error);
+ }
- return (0);
+ return (error);
}
static void
diff --git a/sys/dev/usb/wlan/if_rumvar.h b/sys/dev/usb/wlan/if_rumvar.h
index 9fa733e4c5f9..d4944680803d 100644
--- a/sys/dev/usb/wlan/if_rumvar.h
+++ b/sys/dev/usb/wlan/if_rumvar.h
@@ -73,7 +73,6 @@ typedef STAILQ_HEAD(, rum_tx_data) rum_txdhead;
union sec_param {
struct ieee80211_key key;
- struct wmeParams wme_params[WME_NUM_AC];
uint8_t macaddr[IEEE80211_ADDR_LEN];
struct ieee80211vap *vap;
};
diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c
index d5b52887ba3f..bb52a09322cb 100644
--- a/sys/dev/usb/wlan/if_run.c
+++ b/sys/dev/usb/wlan/if_run.c
@@ -381,7 +381,6 @@ static struct ieee80211_node *run_node_alloc(struct ieee80211vap *,
static int run_media_change(struct ifnet *);
static int run_newstate(struct ieee80211vap *, enum ieee80211_state, int);
static int run_wme_update(struct ieee80211com *);
-static void run_wme_update_cb(void *);
static void run_key_set_cb(void *);
static int run_key_set(struct ieee80211vap *, struct ieee80211_key *);
static void run_key_delete_cb(void *);
@@ -2174,19 +2173,16 @@ run_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
return(rvp->newstate(vap, nstate, arg));
}
-/* ARGSUSED */
-static void
-run_wme_update_cb(void *arg)
+static int
+run_wme_update(struct ieee80211com *ic)
{
- struct ieee80211com *ic = arg;
struct run_softc *sc = ic->ic_softc;
const struct wmeParams *ac =
ic->ic_wme.wme_chanParams.cap_wmeParams;
int aci, error = 0;
- RUN_LOCK_ASSERT(sc, MA_OWNED);
-
/* update MAC TX configuration registers */
+ RUN_LOCK(sc);
for (aci = 0; aci < WME_NUM_AC; aci++) {
error = run_write(sc, RT2860_EDCA_AC_CFG(aci),
ac[aci].wmep_logcwmax << 16 |
@@ -2224,33 +2220,11 @@ run_wme_update_cb(void *arg)
ac[WME_AC_VI].wmep_txopLimit);
err:
+ RUN_UNLOCK(sc);
if (error)
DPRINTF("WME update failed\n");
- return;
-}
-
-static int
-run_wme_update(struct ieee80211com *ic)
-{
- struct run_softc *sc = ic->ic_softc;
-
- /* sometime called wothout lock */
- if (mtx_owned(&ic->ic_comlock.mtx)) {
- uint32_t i = RUN_CMDQ_GET(&sc->cmdq_store);
- DPRINTF("cmdq_store=%d\n", i);
- sc->cmdq[i].func = run_wme_update_cb;
- sc->cmdq[i].arg0 = ic;
- ieee80211_runtask(ic, &sc->cmdq_task);
- return (0);
- }
-
- RUN_LOCK(sc);
- run_wme_update_cb(ic);
- RUN_UNLOCK(sc);
-
- /* return whatever, upper layer doesn't care anyway */
- return (0);
+ return (error);
}
static void
diff --git a/sys/dev/usb/wlan/if_urtwn.c b/sys/dev/usb/wlan/if_urtwn.c
index 0cd1cf342a50..9bc8911be95b 100644
--- a/sys/dev/usb/wlan/if_urtwn.c
+++ b/sys/dev/usb/wlan/if_urtwn.c
@@ -1473,32 +1473,11 @@ urtwn_ra_init(struct urtwn_softc *sc)
return (0);
}
-void
+static void
urtwn_tsf_sync_enable(struct urtwn_softc *sc)
{
- struct ieee80211com *ic = &sc->sc_ic;
- struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
- struct ieee80211_node *ni = vap->iv_bss;
-
- uint64_t tsf;
-
- /* Enable TSF synchronization. */
urtwn_write_1(sc, R92C_BCN_CTRL,
urtwn_read_1(sc, R92C_BCN_CTRL) & ~R92C_BCN_CTRL_DIS_TSF_UDT0);
-
- urtwn_write_1(sc, R92C_BCN_CTRL,
- urtwn_read_1(sc, R92C_BCN_CTRL) & ~R92C_BCN_CTRL_EN_BCN);
-
- /* Set initial TSF. */
- memcpy(&tsf, ni->ni_tstamp.data, 8);
- tsf = le64toh(tsf);
- tsf = tsf - (tsf % (vap->iv_bss->ni_intval * IEEE80211_DUR_TU));
- tsf -= IEEE80211_DUR_TU;
- urtwn_write_4(sc, R92C_TSFTR + 0, tsf);
- urtwn_write_4(sc, R92C_TSFTR + 4, tsf >> 32);
-
- urtwn_write_1(sc, R92C_BCN_CTRL,
- urtwn_read_1(sc, R92C_BCN_CTRL) | R92C_BCN_CTRL_EN_BCN);
}
static void
generated by cgit v1.3 (git 2.53.0) at 2026-09-08 02:05:53 +0000