diff options
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/acx.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/an.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/if_wi.c | 11 |
3 files changed, 12 insertions, 13 deletions
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c index b26fce44c8f..01a306fcb2f 100644 --- a/sys/dev/ic/acx.c +++ b/sys/dev/ic/acx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx.c,v 1.124 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: acx.c,v 1.125 2021/02/25 02:48:19 dlg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -2373,7 +2373,7 @@ acx_set_probe_resp_tmplt(struct acx_softc *sc, struct ieee80211_node *ni) IEEE80211_ADDR_COPY(wh->i_addr3, ni->ni_bssid); *(u_int16_t *)wh->i_seq = 0; - m_copydata(m, 0, m->m_pkthdr.len, (caddr_t)&resp.data); + m_copydata(m, 0, m->m_pkthdr.len, &resp.data); len = m->m_pkthdr.len + sizeof(resp.size); m_freem(m); @@ -2427,7 +2427,7 @@ acx_set_beacon_tmplt(struct acx_softc *sc, struct ieee80211_node *ni) return (1); } - m_copydata(m, 0, off, (caddr_t)&beacon.data); + m_copydata(m, 0, off, &beacon.data); len = off + sizeof(beacon.size); if (acx_set_tmplt(sc, ACXCMD_TMPLT_BEACON, &beacon, len) != 0) { @@ -2442,7 +2442,7 @@ acx_set_beacon_tmplt(struct acx_softc *sc, struct ieee80211_node *ni) return (0); } - m_copydata(m, off, len, (caddr_t)&tim.data); + m_copydata(m, off, len, &tim.data); len += sizeof(beacon.size); m_freem(m); diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c index 97bc598dc66..6208492c94c 100644 --- a/sys/dev/ic/an.c +++ b/sys/dev/ic/an.c @@ -1,4 +1,4 @@ -/* $OpenBSD: an.c,v 1.77 2020/12/08 04:37:27 cheloha Exp $ */ +/* $OpenBSD: an.c,v 1.78 2021/02/25 02:48:20 dlg Exp $ */ /* $NetBSD: an.c,v 1.34 2005/06/20 02:49:18 atatat Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -781,7 +781,7 @@ an_mwrite_bap(struct an_softc *sc, int id, int off, struct mbuf *m, int totlen) len = min(m->m_len, totlen); if ((mtod(m, u_long) & 0x1) || (len & 0x1)) { - m_copydata(m, 0, totlen, (caddr_t)&sc->sc_buf.sc_txbuf); + m_copydata(m, 0, totlen, &sc->sc_buf.sc_txbuf); cnt = (totlen + 1) / 2; an_swap16((u_int16_t *)&sc->sc_buf.sc_txbuf, cnt); CSR_WRITE_MULTI_STREAM_2(sc, AN_DATA0, @@ -1126,7 +1126,7 @@ an_start(struct ifnet *ifp) if (ic->ic_flags & IEEE80211_F_WEPON) wh->i_fc[1] |= IEEE80211_FC1_WEP; m_copydata(m, 0, sizeof(struct ieee80211_frame), - (caddr_t)&frmhdr.an_whdr); + &frmhdr.an_whdr); an_swap16((u_int16_t *)&frmhdr.an_whdr, sizeof(struct ieee80211_frame)/2); /* insert payload length in front of llc/snap */ diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c index 6895e28c175..bd3fe1b86ed 100644 --- a/sys/dev/ic/if_wi.c +++ b/sys/dev/ic/if_wi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi.c,v 1.174 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: if_wi.c,v 1.175 2021/02/25 02:48:20 dlg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -768,7 +768,7 @@ wi_rxeof(struct wi_softc *sc) break; case WI_CRYPTO_SOFTWARE_WEP: m_copydata(m, 0, m->m_pkthdr.len, - (caddr_t)sc->wi_rxbuf); + sc->wi_rxbuf); len = m->m_pkthdr.len - sizeof(struct ether_header); if (wi_do_hostdecrypt(sc, sc->wi_rxbuf + @@ -2400,7 +2400,7 @@ nextpkt: m_copydata(m0, sizeof(struct ether_header), m0->m_pkthdr.len - sizeof(struct ether_header), - (caddr_t)&sc->wi_txbuf[12]); + &sc->wi_txbuf[12]); wi_do_hostencrypt(sc, (caddr_t)&sc->wi_txbuf, tx_frame.wi_dat_len); @@ -2418,7 +2418,7 @@ nextpkt: } else { m_copydata(m0, sizeof(struct ether_header), m0->m_pkthdr.len - sizeof(struct ether_header), - (caddr_t)&sc->wi_txbuf); + &sc->wi_txbuf); tx_frame.wi_dat_len = htole16(tx_frame.wi_dat_len); wi_write_data(sc, id, 0, (caddr_t)&tx_frame, @@ -2438,8 +2438,7 @@ nextpkt: ": host encrypt not implemented for 802.3\n", WI_PRT_ARG(sc)); } else { - m_copydata(m0, 0, m0->m_pkthdr.len, - (caddr_t)&sc->wi_txbuf); + m_copydata(m0, 0, m0->m_pkthdr.len, &sc->wi_txbuf); wi_write_data(sc, id, 0, (caddr_t)&tx_frame, sizeof(struct wi_frame)); |