aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/netmon.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2010-07-19 18:00:20 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2010-07-19 18:00:20 +0000
commit21ef1372a769c7940d017e0e405fad2e31911998 (patch)
tree7b89e677acb02e100788af8866abe7271c375dc9 /wiretap/netmon.c
parent89e6b95d131f7d1d25a8a3bb63a90e5b3f76e2dc (diff)
Initial support for Network Monitor 802.11 radio header.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33583 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap/netmon.c')
-rw-r--r--wiretap/netmon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index afd8f1a90c..a5ac170995 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -146,7 +146,8 @@ static const int netmon_encap[] = {
WTAP_ENCAP_FDDI_BITSWAPPED,
WTAP_ENCAP_ATM_PDUS, /* NDIS WAN - this is what's used for ATM */
WTAP_ENCAP_UNKNOWN, /* NDIS LocalTalk */
- WTAP_ENCAP_UNKNOWN, /* NDIS "DIX" - should not occur */
+ WTAP_ENCAP_IEEE802_11_NETMON_RADIO,
+ /* NDIS "DIX" - used for 802.11 */
WTAP_ENCAP_UNKNOWN, /* NDIS ARCNET raw */
WTAP_ENCAP_UNKNOWN, /* NDIS ARCNET 878.2 */
WTAP_ENCAP_UNKNOWN, /* NDIS ATM (no, this is NOT used for ATM) */