In D41882#954742, @kp wrote:

I've not dug into it yet, but it looks like this causes the sys/netinet6 forward6:fwd_ip6_gu_icmp_gw_ll_fast_success and forward6:fwd_ip6_gu_icmp_gw_ll_slow_success tests to fail.

Sample output:

(kp@freebsd_current_zfs)  /usr/tests/sys/netinet6 % sudo kyua debug forward6:fwd_ip6_gu_icmp_gw_ll_slow_success                                                                    [11:05]
Executing command [ jexec v6t-fff4--8373 route add -6 -host 2001:db8:6666:0000::fff4:4:8373 fe80::6c:e4ff:fe29:e20a%epair0b ]
v6t-fff4--8373: removed
Fail: stderr not empty
--- /dev/null   2023-09-17 09:06:00.862100000 +0000
+++ /tmp/kyua.6ZklLH/2/work/check.jwEAdR/stderr 2023-09-17 09:06:00.859014000 +0000
@@ -0,0 +1 @@
+route: message indicates error: No error: 0
Files left in work directory after failure: created_interfaces.lst, created_jails.lst
ifconfig: interface epair0a does not exist
forward6:fwd_ip6_gu_icmp_gw_ll_slow_success  ->  failed: atf-check failed; see the output of the test for details

I'm not sure if this is because there's something wrong with the patch or because there's something wrong with the test though.

Removed the unnecessary userspace filtering by-interface, the kernel is already doing
that now which I accidentally fixed by calling print_entries_nl with a valid (non-zero) ifindex

I have updated the diff with the style(9) changes suggested

Added full context

In D40972#932738, @kevans wrote:

For future diffs, please include full context (-U999999) or use arc

This does not completely align with beadm behavior.

This looks good to me, it fixes the case I was hitting.

Drop the magic number and make it configurable

In D40442#922144, @franco_opnsense.org wrote:

For the print alone it's beneficial to read the VLAN ID and show it. The way it is now it just pushes the maintenance cost to a future point/individual if the PCAP implementation doesn't do what is assumed here (and not even correctly documented as a comment).

I managed to get subscribed to the hostap mailing list. I also brought along another patch from FreeBSD so the l2 receive code should now be consistent between the two trees.

There was a regression in the latest diff. That has been fixed now.

In D40442#921284, @cy wrote:

Can you also please send this to our upstream, hostap@lists.infradead.org. I prefer not having our source diverge from upstream too much.

Other than that, looks good. I'll do some regression testing here.

Not sure why the last diff did not apply. I recreated it. Hopefully this one works.

This revision narrows the scope of change to only focus on FreeBSD related L2 packet handling in wpa_supplicant. The previous revision updated all occurrences of the filter program, however failed to account for packet and length offsets when handling encapsulated frames. Someone else can pick up the torch and provide patches for other platforms upstream as-needed.