[src/trunk]: src/sys/net80211 Remove ovbcopy from net80211.

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6591e450d6a5
branches:  trunk
changeset: 322457:6591e450d6a5
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu May 03 17:14:37 2018 +0000

description:
Remove ovbcopy from net80211.

diffstat:

 sys/net80211/ieee80211_crypto_ccmp.c |  6 +++---
 sys/net80211/ieee80211_crypto_wep.c  |  6 +++---
 sys/net80211/ieee80211_netbsd.h      |  3 +--
 sys/net80211/ieee80211_output.c      |  6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diffs (98 lines):

diff -r ec48413673b3 -r 6591e450d6a5 sys/net80211/ieee80211_crypto_ccmp.c
--- a/sys/net80211/ieee80211_crypto_ccmp.c      Thu May 03 17:03:20 2018 +0000
+++ b/sys/net80211/ieee80211_crypto_ccmp.c      Thu May 03 17:14:37 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee80211_crypto_ccmp.c,v 1.13 2018/01/19 07:54:34 maxv Exp $  */
+/*     $NetBSD: ieee80211_crypto_ccmp.c,v 1.14 2018/05/03 17:14:37 maxv Exp $  */
 
 /*
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_ccmp.c,v 1.7 2005/07/11 03:06:23 sam Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_ccmp.c,v 1.13 2018/01/19 07:54:34 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_ccmp.c,v 1.14 2018/05/03 17:14:37 maxv Exp $");
 #endif
 
 /*
@@ -243,7 +243,7 @@
        /*
         * Copy up 802.11 header and strip crypto bits.
         */
-       ovbcopy(mtod(m, void *), mtod(m, u_int8_t *) + ccmp.ic_header, hdrlen);
+       memmove(mtod(m, u_int8_t *) + ccmp.ic_header, mtod(m, void *), hdrlen);
        m_adj(m, ccmp.ic_header);
        m_adj(m, -ccmp.ic_trailer);
 
diff -r ec48413673b3 -r 6591e450d6a5 sys/net80211/ieee80211_crypto_wep.c
--- a/sys/net80211/ieee80211_crypto_wep.c       Thu May 03 17:03:20 2018 +0000
+++ b/sys/net80211/ieee80211_crypto_wep.c       Thu May 03 17:14:37 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee80211_crypto_wep.c,v 1.11 2018/01/19 07:58:25 maxv Exp $   */
+/*     $NetBSD: ieee80211_crypto_wep.c,v 1.12 2018/05/03 17:14:37 maxv Exp $   */
 
 /*
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_wep.c,v 1.7 2005/06/10 16:11:24 sam Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_wep.c,v 1.11 2018/01/19 07:58:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_wep.c,v 1.12 2018/05/03 17:14:37 maxv Exp $");
 #endif
 
 /*
@@ -227,7 +227,7 @@
        /*
         * Copy up 802.11 header and strip crypto bits.
         */
-       ovbcopy(mtod(m, void *), mtod(m, u_int8_t *) + wep.ic_header, hdrlen);
+       memmove(mtod(m, u_int8_t *) + wep.ic_header, mtod(m, void *), hdrlen);
        m_adj(m, wep.ic_header);
        m_adj(m, -wep.ic_trailer);
 
diff -r ec48413673b3 -r 6591e450d6a5 sys/net80211/ieee80211_netbsd.h
--- a/sys/net80211/ieee80211_netbsd.h   Thu May 03 17:03:20 2018 +0000
+++ b/sys/net80211/ieee80211_netbsd.h   Thu May 03 17:14:37 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.h,v 1.20 2018/04/27 06:56:21 maxv Exp $ */
+/* $NetBSD: ieee80211_netbsd.h,v 1.21 2018/05/03 17:14:37 maxv Exp $ */
 /*-
  * Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
  * All rights reserved.
@@ -231,7 +231,6 @@
 
 #ifdef _KERNEL
 #define        ticks   hardclock_ticks
-#define        ovbcopy(__src, __dst, __n)      ((void)memmove(__dst, __src, __n))
 
 void   if_printf(struct ifnet *, const char *, ...);
 void   get_random_bytes(void *, size_t);
diff -r ec48413673b3 -r 6591e450d6a5 sys/net80211/ieee80211_output.c
--- a/sys/net80211/ieee80211_output.c   Thu May 03 17:03:20 2018 +0000
+++ b/sys/net80211/ieee80211_output.c   Thu May 03 17:14:37 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee80211_output.c,v 1.61 2018/01/18 16:23:43 maxv Exp $       */
+/*     $NetBSD: ieee80211_output.c,v 1.62 2018/05/03 17:14:37 maxv Exp $       */
 
 /*
  * Copyright (c) 2001 Atsushi Onoe
@@ -37,7 +37,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.34 2005/08/10 16:22:29 sam Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_output.c,v 1.61 2018/01/18 16:23:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_output.c,v 1.62 2018/05/03 17:14:37 maxv Exp $");
 #endif
 
 #ifdef _KERNEL_OPT
@@ -2084,7 +2084,7 @@
                        }
                        if (timlen != bo->bo_tim_len) {
                                /* copy up/down trailer */
-                               ovbcopy(bo->bo_trailer, tie->tim_bitmap+timlen,
+                               memmove(tie->tim_bitmap+timlen, bo->bo_trailer,
                                        bo->bo_trailer_len);
                                bo->bo_trailer = tie->tim_bitmap+timlen;
                                bo->bo_wme = bo->bo_trailer;