routing on interface

Author: Emmankoko

distrib/sets/lists/base/shl.mi

@@ -136,6 +136,9 @@
 ./lib/npf/ext_rndblock.so			base-npf-shlib		compatfile,npf
 ./lib/npf/ext_rndblock.so.0			base-npf-shlib		compatfile,npf
 ./lib/npf/ext_rndblock.so.0.0			base-npf-shlib		compatfile,npf
+./lib/npf/ext_route.so				base-npf-shlib		compatfile,npf
+./lib/npf/ext_route.so.0			base-npf-shlib		compatfile,npf
+./lib/npf/ext_route.so.0.0			base-npf-shlib		compatfile,npf
 ./libexec/ld.elf_so				base-sys-shlib		dynamicroot
 ./usr/lib/i18n/libBIG5.so			base-i18n-shlib		compatfile
 ./usr/lib/i18n/libBIG5.so.5			base-i18n-shlib		compatfile

distrib/sets/lists/modules/mi

@@ -363,6 +363,8 @@
 ./@MODULEDIR@/npf_ext_normalize/npf_ext_normalize.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/npf_ext_rndblock			modules-base-kernel	kmod
 ./@MODULEDIR@/npf_ext_rndblock/npf_ext_rndblock.kmod	modules-base-kernel	kmod
+./@MODULEDIR@/npf_ext_route			modules-base-kernel	kmod
+./@MODULEDIR@/npf_ext_route/npf_ext_route.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/ntfs				modules-base-kernel	kmod
 ./@MODULEDIR@/ntfs/ntfs.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/null				modules-base-kernel	kmod

lib/npf/Makefile

@@ -4,7 +4,7 @@
 
 .if ${MKPIC} != "no"
 
-SUBDIR=		ext_log ext_normalize ext_rndblock
+SUBDIR=		ext_log ext_normalize ext_rndblock ext_route
 
 .endif
 

lib/npf/ext_route/Makefile

@@ -0,0 +1,4 @@
+# $NetBSD: Makefile,v 1.3 2013/03/10 21:41:06 joe Exp $
+
+MOD=	ext_route
+.include "${.CURDIR}/../mod.mk"

lib/npf/ext_route/npfext_route.c

@@ -0,0 +1,71 @@
+/*-
+ * Copyright (c) 2025 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Mindaugas Rasiukevicius.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD$");
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <errno.h>
+#include <err.h>
+#include <unistd.h>
+
+#include <npf.h>
+
+int             npfext_route_init(void);
+nl_ext_t *      npfext_route_construct(const char *);
+int             npfext_route_param(nl_ext_t *, const char *, const char *);
+
+int
+npfext_route_init(void)
+{
+    /* Nothing to initialise. */
+    return 0;
+}
+
+nl_ext_t *
+npfext_route_construct(const char *name)
+{
+    assert(strcmp(name, "route") == 0);
+    return npf_ext_construct(name);
+}
+
+int
+npfext_route_param(nl_ext_t *ext, const char *param, const char *val __unused)
+{
+    assert(param != NULL);
+    npf_ext_param_string(ext, "route-interface", param);
+    return 0;
+}

lib/npf/ext_route/shlib_version

@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2025/08/26 00:32:25 joe Exp $
+
+major=0
+minor=0

sys/compat/common/usb_subr_30.c

@@ -147,7 +147,7 @@ usbd_fill_deviceinfo30(struct usbd_device *dev,
 	di->udi_class = dev->ud_ddesc.bDeviceClass;
 	di->udi_subclass = dev->ud_ddesc.bDeviceSubClass;
 	di->udi_protocol = dev->ud_ddesc.bDeviceProtocol;
-	di->udi_config = dev->ud_config;
+	di->udi_config = dev->ud_configno;
 	di->udi_power = dev->ud_selfpowered ? 0 : dev->ud_power;
 	di->udi_speed = dev->ud_speed;
 

sys/dev/pci/if_athn_pci.c

@@ -106,7 +106,8 @@ athn_pci_match(device_t parent, cfdata_t match, void *aux)
 		{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR2427 },
 		{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9227 },
 		{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9287 },
-		{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9300 }
+		{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9300 },
+		{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9462 }
 	};
 	struct pci_attach_args *pa = aux;
 	size_t i;