D40442.id122985.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40442.id122985.diff
View Options

	diff --git a/contrib/wpa/src/l2_packet/l2_packet_freebsd.c b/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
	--- a/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
	+++ b/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
	@@ -21,6 +21,7 @@
	#include <sys/sysctl.h>
	#endif /* __sun__ */

	+#include <net/ethernet.h>
	#include <net/if.h>
	#include <net/if_dl.h>
	#include <net/route.h>
	@@ -99,6 +100,11 @@
	} else {
	buf = (unsigned char *) (ethhdr + 1);
	len = hdr->caplen - sizeof(*ethhdr);
	+ /* handle 8021Q encapsulated frames */
	+ if (ethhdr->h_proto == htons(ETH_P_8021Q)) {
	+ buf += ETHER_VLAN_ENCAP_LEN;
	+ len -= ETHER_VLAN_ENCAP_LEN;
	+ }
	}
	l2->rx_callback(l2->rx_callback_ctx, ethhdr->h_source, buf, len);
	}
	@@ -127,10 +133,10 @@
	os_snprintf(pcap_filter, sizeof(pcap_filter),
	"not ether src " MACSTR " and "
	"( ether dst " MACSTR " or ether dst " MACSTR " ) and "
	- "ether proto 0x%x",
	+ "( ether proto 0x%x or ( vlan 0 and ether proto 0x%x ) )",
	MAC2STR(l2->own_addr), /* do not receive own packets */
	MAC2STR(l2->own_addr), MAC2STR(pae_group_addr),
	- protocol);
	+ protocol, protocol);
	if (pcap_compile(l2->pcap, &pcap_fp, pcap_filter, 1, pcap_netp) < 0) {
	fprintf(stderr, "pcap_compile: %s\n", pcap_geterr(l2->pcap));
	return -1;