Module Name: src
Committed By: maxv
Date: Thu May 3 17:14:37 UTC 2018
Modified Files:
src/sys/net80211: ieee80211_crypto_ccmp.c ieee80211_crypto_wep.c
ieee80211_netbsd.h ieee80211_output.c
Log Message:
Remove ovbcopy from net80211.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/net80211/ieee80211_crypto_ccmp.c
cvs rdiff -u -r1.11 -r1.12 src/sys/net80211/ieee80211_crypto_wep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/net80211/ieee80211_netbsd.h
cvs rdiff -u -r1.61 -r1.62 src/sys/net80211/ieee80211_output.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/net80211/ieee80211_crypto_ccmp.c
diff -u src/sys/net80211/ieee80211_crypto_ccmp.c:1.13 src/sys/net80211/ieee80211_crypto_ccmp.c:1.14
--- src/sys/net80211/ieee80211_crypto_ccmp.c:1.13 Fri Jan 19 07:54:34 2018
+++ src/sys/net80211/ieee80211_crypto_ccmp.c Thu May 3 17:14:37 2018
@@ -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 @@ ccmp_decap(struct ieee80211_key *k, stru
/*
* 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);
Index: src/sys/net80211/ieee80211_crypto_wep.c
diff -u src/sys/net80211/ieee80211_crypto_wep.c:1.11 src/sys/net80211/ieee80211_crypto_wep.c:1.12
--- src/sys/net80211/ieee80211_crypto_wep.c:1.11 Fri Jan 19 07:58:25 2018
+++ src/sys/net80211/ieee80211_crypto_wep.c Thu May 3 17:14:37 2018
@@ -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 @@ wep_decap(struct ieee80211_key *k, struc
/*
* 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);
Index: src/sys/net80211/ieee80211_netbsd.h
diff -u src/sys/net80211/ieee80211_netbsd.h:1.20 src/sys/net80211/ieee80211_netbsd.h:1.21
--- src/sys/net80211/ieee80211_netbsd.h:1.20 Fri Apr 27 06:56:21 2018
+++ src/sys/net80211/ieee80211_netbsd.h Thu May 3 17:14:37 2018
@@ -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 @@ struct ieee80211_michael_event {
#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);
Index: src/sys/net80211/ieee80211_output.c
diff -u src/sys/net80211/ieee80211_output.c:1.61 src/sys/net80211/ieee80211_output.c:1.62
--- src/sys/net80211/ieee80211_output.c:1.61 Thu Jan 18 16:23:43 2018
+++ src/sys/net80211/ieee80211_output.c Thu May 3 17:14:37 2018
@@ -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 @@ ieee80211_beacon_update(struct ieee80211
}
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;
