Module Name: src
Committed By: maxv
Date: Thu Feb 1 16:49:35 UTC 2018
Modified Files:
src/sys/dev/ic: arn5008.c arn9003.c
src/sys/dev/usb: if_athn_usb.c if_run.c
Log Message:
Replace ovbcopy -> memmove, same.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/arn5008.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/arn9003.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/usb/if_athn_usb.c \
src/sys/dev/usb/if_run.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/arn5008.c
diff -u src/sys/dev/ic/arn5008.c:1.13 src/sys/dev/ic/arn5008.c:1.14
--- src/sys/dev/ic/arn5008.c:1.13 Tue May 23 02:19:14 2017
+++ src/sys/dev/ic/arn5008.c Thu Feb 1 16:49:34 2018
@@ -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);
}
}
Index: src/sys/dev/ic/arn9003.c
diff -u src/sys/dev/ic/arn9003.c:1.11 src/sys/dev/ic/arn9003.c:1.12
--- src/sys/dev/ic/arn9003.c:1.11 Tue May 23 02:19:14 2017
+++ src/sys/dev/ic/arn9003.c Thu Feb 1 16:49:34 2018
@@ -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,
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);
}
}
Index: src/sys/dev/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.25 src/sys/dev/usb/if_athn_usb.c:1.26
--- src/sys/dev/usb/if_athn_usb.c:1.25 Sun Jan 21 13:57:11 2018
+++ src/sys/dev/usb/if_athn_usb.c Thu Feb 1 16:49:34 2018
@@ -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
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);
}
}
Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.25 src/sys/dev/usb/if_run.c:1.26
--- src/sys/dev/usb/if_run.c:1.25 Sun Jan 21 13:57:12 2018
+++ src/sys/dev/usb/if_run.c Thu Feb 1 16:49:34 2018
@@ -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
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);
}
