CVS commit: src/sys/net80211
Module Name:src Committed By: yamt Date: Sat Nov 19 07:57:51 UTC 2022 Modified Files: src/sys/net80211: ieee80211_input.c Log Message: ieee80211_input.c: Fix a few debug messages To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/net80211/ieee80211_input.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_input.c diff -u src/sys/net80211/ieee80211_input.c:1.116 src/sys/net80211/ieee80211_input.c:1.117 --- src/sys/net80211/ieee80211_input.c:1.116 Wed Jan 29 05:21:14 2020 +++ src/sys/net80211/ieee80211_input.c Sat Nov 19 07:57:51 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ieee80211_input.c,v 1.116 2020/01/29 05:21:14 thorpej Exp $ */ +/* $NetBSD: ieee80211_input.c,v 1.117 2022/11/19 07:57:51 yamt Exp $ */ /* * Copyright (c) 2001 Atsushi Onoe @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.81 2005/08/10 16:22:29 sam Exp $"); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.116 2020/01/29 05:21:14 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.117 2022/11/19 07:57:51 yamt Exp $"); #endif #ifdef _KERNEL_OPT @@ -182,7 +182,7 @@ ieee80211_input_data(struct ieee80211com case IEEE80211_M_STA: if (dir != IEEE80211_FC1_DIR_FROMDS) { IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, - wh, "data", "%s", "unknown dir 0x%x", dir); + wh, "data", "unknown dir 0x%x", dir); ic->ic_stats.is_rx_wrongdir++; goto out; } @@ -206,7 +206,7 @@ ieee80211_input_data(struct ieee80211com case IEEE80211_M_AHDEMO: if (dir != IEEE80211_FC1_DIR_NODS) { IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, - wh, "data", "%s", "unknown dir 0x%x", dir); + wh, "data", "unknown dir 0x%x", dir); ic->ic_stats.is_rx_wrongdir++; goto out; } @@ -217,7 +217,7 @@ ieee80211_input_data(struct ieee80211com #ifndef IEEE80211_NO_HOSTAP if (dir != IEEE80211_FC1_DIR_TODS) { IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, - wh, "data", "%s", "unknown dir 0x%x", dir); + wh, "data", "unknown dir 0x%x", dir); ic->ic_stats.is_rx_wrongdir++; goto out; } @@ -399,7 +399,7 @@ ieee80211_input_management(struct ieee80 IEEE80211_NODE_STAT(ni, rx_mgmt); if (dir != IEEE80211_FC1_DIR_NODS) { IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, - wh, "data", "%s", "unknown dir 0x%x", dir); + wh, "data", "unknown dir 0x%x", dir); ic->ic_stats.is_rx_wrongdir++; goto err; }
CVS commit: src/sys/net80211
Module Name:src Committed By: yamt Date: Sat Nov 19 07:57:51 UTC 2022 Modified Files: src/sys/net80211: ieee80211_input.c Log Message: ieee80211_input.c: Fix a few debug messages To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/net80211/ieee80211_input.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src Committed By: yamt Date: Sat Nov 19 07:54:25 UTC 2022 Modified Files: src/sys/conf: assym.mk Log Message: assym.mk: Fix assym.d generation It seems that the genassym/mkdep output has been changed. This commit adapts the assym.d generation rule to the new output. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/conf/assym.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/assym.mk diff -u src/sys/conf/assym.mk:1.7 src/sys/conf/assym.mk:1.8 --- src/sys/conf/assym.mk:1.7 Thu Jul 9 02:13:58 2020 +++ src/sys/conf/assym.mk Sat Nov 19 07:54:25 2022 @@ -1,4 +1,4 @@ -# $NetBSD: assym.mk,v 1.7 2020/07/09 02:13:58 christos Exp $ +# $NetBSD: assym.mk,v 1.8 2022/11/19 07:54:25 yamt Exp $ GENASSYM_FLAGS=${CFLAGS:N-Wa,*:N-fstack-usage*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS} @@ -16,11 +16,26 @@ ${SRCS:M*.[sS]:C|\.[Ss]|.o|}: assym.h ${SRCS:M*.[sS]:C|\.[Ss]|.d|}: assym.h .endif +# assym.dep in the below target looks like: +# +# assym.o: \ +#/var/folders/74/hw1sphgx0lv63q6pq_n5grw0gn/T//genassym.BCtq6a/assym.c \ +#opt_arm_start.h opt_execfmt.h opt_multiprocessor.h \ +# : +# : +# +# The following sed modifies it to: +# +# assym.h: \ +#opt_arm_start.h opt_execfmt.h opt_multiprocessor.h \ +# : +# : + assym.d: assym.h ${_MKTARGET_CREATE} cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \ ${GENASSYM} -- ${MKDEP} -f assym.dep -- ${GENASSYM_FLAGS} - ${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET} + ${TOOL_SED} -e '1{N;s/\\\n//;}' -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET} rm -f assym.dep DEPS+= assym.d
CVS commit: src/sys/conf
Module Name:src Committed By: yamt Date: Sat Nov 19 07:54:25 UTC 2022 Modified Files: src/sys/conf: assym.mk Log Message: assym.mk: Fix assym.d generation It seems that the genassym/mkdep output has been changed. This commit adapts the assym.d generation rule to the new output. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/conf/assym.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/blocklist/bin
Module Name:src Committed By: christos Date: Fri Nov 18 16:01:01 UTC 2022 Modified Files: src/external/bsd/blocklist/bin: conf.c Log Message: Allow configuration of addresses without a mask/prefix (Jose Luis Duran) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/blocklist/bin/conf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/blocklist/bin/conf.c diff -u src/external/bsd/blocklist/bin/conf.c:1.2 src/external/bsd/blocklist/bin/conf.c:1.3 --- src/external/bsd/blocklist/bin/conf.c:1.2 Mon Jun 13 11:00:20 2022 +++ src/external/bsd/blocklist/bin/conf.c Fri Nov 18 11:01:00 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.2 2022/06/13 15:00:20 christos Exp $ */ +/* $NetBSD: conf.c,v 1.3 2022/11/18 16:01:00 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #endif #include -__RCSID("$NetBSD: conf.c,v 1.2 2022/06/13 15:00:20 christos Exp $"); +__RCSID("$NetBSD: conf.c,v 1.3 2022/11/18 16:01:00 christos Exp $"); #include #ifdef HAVE_LIBUTIL_H @@ -471,7 +471,6 @@ conf_amask_eq(const void *v1, const void uint32_t m; int omask = mask; - len >>= 2; switch (mask) { case FSTAR: if (memcmp(v1, v2, len) == 0) @@ -485,7 +484,7 @@ conf_amask_eq(const void *v1, const void break; } - for (size_t i = 0; i < len; i++) { + for (size_t i = 0; i < (len >> 2); i++) { if (mask > 32) { m = htonl((uint32_t)~0); mask -= 32; @@ -501,7 +500,6 @@ conf_amask_eq(const void *v1, const void out: if (debug > 1) { char b1[256], b2[256]; - len <<= 2; blhexdump(b1, sizeof(b1), "a1", v1, len); blhexdump(b2, sizeof(b2), "a2", v2, len); (*lfun)(LOG_DEBUG, "%s: %s != %s [0x%x]", __func__,
CVS commit: src/external/bsd/blocklist/bin
Module Name:src Committed By: christos Date: Fri Nov 18 16:01:01 UTC 2022 Modified Files: src/external/bsd/blocklist/bin: conf.c Log Message: Allow configuration of addresses without a mask/prefix (Jose Luis Duran) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/blocklist/bin/conf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.