summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-02-09 02:47:24 -0800
committerGuy Harris <guy@alum.mit.edu>2015-02-09 02:47:24 -0800
commitc04ba484a2f17073c4348d3f840376de0d6424b0 (patch)
tree2b9c18d60a52773428fe99ecdb1d9478587a3029
parent1db71227404d0da0cac0e6ee366bf0175dcce3b9 (diff)
downloadlibpcap-c04ba484a2f17073c4348d3f840376de0d6424b0.tar.gz
Handle VLANs atop 802.11.
-rw-r--r--gencode.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/gencode.c b/gencode.c
index 2d23ab25..770757bb 100644
--- a/gencode.c
+++ b/gencode.c
@@ -7868,7 +7868,7 @@ gen_vlan_no_bpf_extensions(int vlan_num)
/* If a specific VLAN is requested, check VLAN id */
if (vlan_num >= 0) {
- b1 = gen_mcmp(OR_LINKPL, 0, BPF_H,
+ b1 = gen_mcmp(OR_NET, 0, BPF_H,
(bpf_int32)vlan_num, 0x0fff);
gen_and(b0, b1);
b0 = b1;
@@ -7951,6 +7951,14 @@ gen_vlan(vlan_num)
#endif
b0 = gen_vlan_no_bpf_extensions(vlan_num);
break;
+
+ case DLT_IEEE802_11:
+ case DLT_PRISM_HEADER:
+ case DLT_IEEE802_11_RADIO_AVS:
+ case DLT_IEEE802_11_RADIO:
+ b0 = gen_vlan_no_bpf_extensions(vlan_num);
+ break;
+
default:
bpf_error("no VLAN support for data link type %d",
linktype);