diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 18:15:56 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 18:15:56 +0000 |
| commit | 11fcc68fad30620c6ac87dba9b240103f5cbc4e6 (patch) | |
| tree | a2f7140c0e82286b40dda1a6da540fefba2e3cf9 /sys/dev/ic | |
| parent | 053f2c9694efd78cad0fb364e18939d590655719 (diff) | |
Replace all ovbcopy with memmove; swap the src and dst arguments too
ok otto
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/acx100.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/ar5008.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/ar9003.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/rt2860.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ic/acx100.c b/sys/dev/ic/acx100.c index ebf156781ab..bfa52bda446 100644 --- a/sys/dev/ic/acx100.c +++ b/sys/dev/ic/acx100.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx100.c,v 1.22 2012/10/27 16:13:28 claudio Exp $ */ +/* $OpenBSD: acx100.c,v 1.23 2013/06/11 18:15:53 deraadt Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -732,7 +732,7 @@ acx100_proc_wep_rxbuf(struct acx_softc *sc, struct mbuf *m, int *len) *len = *len - IEEEWEP_EXLEN; /* Move MAC header toward frame body */ - ovbcopy(f, (uint8_t *)f + IEEEWEP_IVLEN, mac_hdrlen); + memmove((uint8_t *)f + IEEEWEP_IVLEN, f, mac_hdrlen); m_adj(m, IEEEWEP_IVLEN); #undef IEEEWEP_EXLEN diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c index 83fb33e18e3..ac6a7d39f3a 100644 --- a/sys/dev/ic/ar5008.c +++ b/sys/dev/ic/ar5008.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5008.c,v 1.21 2012/08/25 12:14:31 kettenis Exp $ */ +/* $OpenBSD: ar5008.c,v 1.22 2013/06/11 18:15:53 deraadt Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -907,7 +907,7 @@ ar5008_rx_process(struct athn_softc *sc) if (!(wh->i_fc[0] & IEEE80211_FC0_TYPE_CTL)) { u_int hdrlen = ieee80211_get_hdrlen(wh); if (hdrlen & 3) { - ovbcopy(wh, (caddr_t)wh + 2, hdrlen); + memmove((caddr_t)wh + 2, wh, hdrlen); m_adj(m, 2); } } diff --git a/sys/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c index 7ad600d0bc9..86d19cb263e 100644 --- a/sys/dev/ic/ar9003.c +++ b/sys/dev/ic/ar9003.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar9003.c,v 1.25 2012/10/20 09:53:32 stsp Exp $ */ +/* $OpenBSD: ar9003.c,v 1.26 2013/06/11 18:15:53 deraadt Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1024,7 +1024,7 @@ ar9003_rx_process(struct athn_softc *sc, int qid) if (!(wh->i_fc[0] & IEEE80211_FC0_TYPE_CTL)) { u_int hdrlen = ieee80211_get_hdrlen(wh); if (hdrlen & 3) { - ovbcopy(wh, (caddr_t)wh + 2, hdrlen); + memmove((caddr_t)wh + 2, wh, hdrlen); m_adj(m, 2); } } diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c index d420a95a306..0fad289564d 100644 --- a/sys/dev/ic/rt2860.c +++ b/sys/dev/ic/rt2860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860.c,v 1.67 2012/10/12 19:53:24 haesbaert Exp $ */ +/* $OpenBSD: rt2860.c,v 1.68 2013/06/11 18:15:53 deraadt Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1312,7 +1312,7 @@ rt2860_rx_intr(struct rt2860_softc *sc) /* HW may insert 2 padding bytes after 802.11 header */ if (rxd->flags & htole32(RT2860_RX_L2PAD)) { u_int hdrlen = ieee80211_get_hdrlen(wh); - ovbcopy(wh, (caddr_t)wh + 2, hdrlen); + memmove((caddr_t)wh + 2, wh, hdrlen); m->m_data += 2; wh = mtod(m, struct ieee80211_frame *); } |