summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormaxv <maxv@NetBSD.org>2018-02-01 16:49:34 +0000
committermaxv <maxv@NetBSD.org>2018-02-01 16:49:34 +0000
commit99f4cb9d6479f4f3bb4e9b74e14c7ecd17c8426f (patch)
tree8b08ae6b817e170f21cbf522bb97396e2184d796 /sys/dev
parentf7fb9721940cc82edbfa308328abbca108f76856 (diff)
Replace ovbcopy -> memmove, same.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/arn5008.c6
-rw-r--r--sys/dev/ic/arn9003.c6
-rw-r--r--sys/dev/usb/if_athn_usb.c6
-rw-r--r--sys/dev/usb/if_run.c6
4 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/ic/arn5008.c b/sys/dev/ic/arn5008.c
index 1d7cf669b9f..6ed8ea02ba9 100644
--- a/sys/dev/ic/arn5008.c
+++ b/sys/dev/ic/arn5008.c
@@ -1,4 +1,4 @@
-/* $NetBSD: arn5008.c,v 1.13 2017/05/23 02:19:14 ozaki-r Exp $ */
+/* $NetBSD: arn5008.c,v 1.14 2018/02/01 16:49:34 maxv Exp $ */
/* $OpenBSD: ar5008.c,v 1.21 2012/08/25 12:14:31 kettenis Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.13 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.14 2018/02/01 16:49:34 maxv Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -920,7 +920,7 @@ ar5008_rx_process(struct athn_softc *sc)
if (!(wh->i_fc[0] & IEEE80211_FC0_TYPE_CTL)) {
u_int hdrlen = ieee80211_anyhdrsize(wh);
if (hdrlen & 3) {
- ovbcopy(wh, (uint8_t *)wh + 2, hdrlen);
+ memmove((uint8_t *)wh + 2, wh, hdrlen);
m_adj(m, 2);
}
}
diff --git a/sys/dev/ic/arn9003.c b/sys/dev/ic/arn9003.c
index b925cbff51b..935a6bf629f 100644
--- a/sys/dev/ic/arn9003.c
+++ b/sys/dev/ic/arn9003.c
@@ -1,4 +1,4 @@
-/* $NetBSD: arn9003.c,v 1.11 2017/05/23 02:19:14 ozaki-r Exp $ */
+/* $NetBSD: arn9003.c,v 1.12 2018/02/01 16:49:34 maxv Exp $ */
/* $OpenBSD: ar9003.c,v 1.25 2012/10/20 09:53:32 stsp Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.11 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.12 2018/02/01 16:49:34 maxv Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1053,7 +1053,7 @@ ar9003_rx_process(struct athn_softc *sc, int qid)
if (!(wh->i_fc[0] & IEEE80211_FC0_TYPE_CTL)) {
u_int hdrlen = ieee80211_anyhdrsize(wh);
if (hdrlen & 3) {
- ovbcopy(wh, (uint8_t *)wh + 2, hdrlen);
+ memmove((uint8_t *)wh + 2, wh, hdrlen);
m_adj(m, 2);
}
}
diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c
index fe96a2dadc1..b9dcdcb2f9b 100644
--- a/sys/dev/usb/if_athn_usb.c
+++ b/sys/dev/usb/if_athn_usb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.25 2018/01/21 13:57:11 skrll Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.26 2018/02/01 16:49:34 maxv Exp $ */
/* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.25 2018/01/21 13:57:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.26 2018/02/01 16:49:34 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2259,7 +2259,7 @@ athn_usb_rx_frame(struct athn_usb_softc *usc, struct mbuf *m)
if (!(wh->i_fc[0] & IEEE80211_FC0_TYPE_CTL)) {
u_int hdrlen = ieee80211_anyhdrsize(wh);
if (hdrlen & 3) {
- ovbcopy(wh, (uint8_t *)wh + 2, hdrlen);
+ memmove((uint8_t *)wh + 2, wh, hdrlen);
m_adj(m, 2);
}
}
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 02d668a4a61..9333d0d2d85 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_run.c,v 1.25 2018/01/21 13:57:12 skrll Exp $ */
+/* $NetBSD: if_run.c,v 1.26 2018/02/01 16:49:34 maxv Exp $ */
/* $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.25 2018/01/21 13:57:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.26 2018/02/01 16:49:34 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2241,7 +2241,7 @@ run_rx_frame(struct run_softc *sc, uint8_t *buf, int dmalen)
if (flags & RT2860_RX_L2PAD) {
u_int hdrlen = ieee80211_hdrspace(ic, wh);
- ovbcopy(wh, (uint8_t *)wh + 2, hdrlen);
+ memmove((uint8_t *)wh + 2, wh, hdrlen);
wh = (struct ieee80211_frame *)((uint8_t *)wh + 2);
}