sync with OpenBSD -current

sys/net/if_pfsync.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pfsync.h,v 1.62 2024/05/13 01:15:53 jsg Exp $	*/
+/*	$OpenBSD: if_pfsync.h,v 1.63 2024/10/12 23:10:07 jsg Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -273,8 +273,6 @@ struct pfsyncreq {
 
 #ifdef _KERNEL
 
-#include <sys/percpu.h>
-
 enum pfsync_counters {
 	pfsyncs_ipackets,
 	pfsyncs_ipackets6,

sys/net/if_var.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_var.h,v 1.132 2023/12/23 10:52:54 bluhm Exp $	*/
+/*	$OpenBSD: if_var.h,v 1.133 2024/10/12 23:18:10 jsg Exp $	*/
 /*	$NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $	*/
 
 /*
@@ -43,7 +43,6 @@
 #include <sys/srp.h>
 #include <sys/refcnt.h>
 #include <sys/task.h>
-#include <sys/time.h>
 #include <sys/timeout.h>
 
 #include <net/ifq.h>

sys/net/pfvar.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfvar.h,v 1.539 2024/08/27 13:52:41 aisha Exp $ */
+/*	$OpenBSD: pfvar.h,v 1.540 2024/10/12 23:31:14 jsg Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -36,7 +36,6 @@
 
 #include <sys/queue.h>
 #include <sys/tree.h>
-#include <sys/rwlock.h>
 #include <sys/syslimits.h>
 #include <sys/refcnt.h>
 #include <sys/timeout.h>

usr.sbin/fw_update/fw_update.8

@@ -1,4 +1,4 @@
-.\" $OpenBSD: fw_update.8,v 1.3 2022/03/09 22:39:12 jsg Exp $
+.\" $OpenBSD: fw_update.8,v 1.4 2024/10/12 23:56:23 afresh1 Exp $
 .\"
 .\" Copyright (c) 2011 Alexander Hall <alexander@beard.se>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 9 2022 $
+.Dd $Mdocdate: October 12 2024 $
 .Dt FW_UPDATE 8
 .Os
 .Sh NAME
@@ -31,11 +31,9 @@ The
 utility installs, updates, or deletes firmware packages for
 .Ar driver
 from the Internet.
-If no
+By default,
-.Ar driver
-is specified, the
 .Nm
-utility tries to determine which firmware is needed on the system.
+tries to determine which firmware packages are needed.
 .Pp
 Since firmware with an acceptable license is already present in
 .Ox ,
@@ -51,9 +49,6 @@ Install or update firmware for all drivers.
 It is an error to specify this option with any
 .Ar driver
 arguments.
-This is enabled by default unless drivers, files or
-.Fl d
-are specified.
 .It Fl d
 Delete firmware for
 .Ar driver .

usr.sbin/fw_update/fw_update.sh

@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_update.sh,v 1.56 2024/03/21 01:02:29 afresh1 Exp $
+#	$OpenBSD: fw_update.sh,v 1.57 2024/10/12 23:56:23 afresh1 Exp $
 #
 # Copyright (c) 2021,2023 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -331,6 +331,11 @@ EOL
 	return 0
 }
 
+available_firmware() {
+	check_cfile || return $?
+	sed -n 's/.*(\(.*\)-firmware.*/\1/p' "$CFILE"
+}
+
 installed_firmware() {
 	local _pre="$1" _match="$2" _post="$3" _firmware _fw
 	set -sA _firmware -- $(
@@ -626,6 +631,8 @@ CFILE="$LOCALSRC/$CFILE"
 
 if [ "${devices[*]:-}" ]; then
 	"$ALL" && warn "Cannot use -a and devices/files" && usage
+elif "$ALL"; then
+	set -sA devices -- $( available_firmware )
 else
 	((VERBOSE > 1)) && echo -n "Detect firmware ..."
 	set -sA devices -- $( detect_firmware )

usr.sbin/fw_update/patterns.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: patterns.c,v 1.14 2024/08/18 14:58:47 phessler Exp $	*/
+/*	$OpenBSD: patterns.c,v 1.15 2024/10/13 00:00:41 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou.  All rights reserved.
@@ -115,7 +115,7 @@ main(void)
 	printf("%s\n", "otus");
 	printf("%s\n", "pgt");
 	printf("%s\n", "qcpas");
-	printf("%s\n", "qcpas ^ppb0*\"Qualcomm SC8280XP PCIe\"");
+	printf("%s\n", "qcpas ^ppb0*\"Qualcomm ^cpu0*\"Qualcomm");
 	printf("%s\n", "qwx");
 	printf("%s\n", "qwz");
 	printf("%s\n", "radeondrm");