diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-07-19 18:00:20 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-07-19 18:00:20 +0000 |
| commit | d1751061c8a3b7c560869d3c2222f1ec723bad67 (patch) | |
| tree | 7b89e677acb02e100788af8866abe7271c375dc9 /wiretap/netmon.c | |
| parent | 703635b9796d77cc9ff16671a598a9af1a7aff53 (diff) | |
Initial support for Network Monitor 802.11 radio header.
svn path=/trunk/; revision=33583
Diffstat (limited to 'wiretap/netmon.c')
| -rw-r--r-- | wiretap/netmon.c | 3 |
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) */ |