diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-05-02 03:11:00 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-05-02 03:11:00 +0000 |
| commit | 0275247b9788e74a97414abc74f6e9f12868ee57 (patch) | |
| tree | e683bcda97ba1f4c5b23656635d578a9d897f51a /wiretap/netmon.c | |
| parent | 8be799ecafab97966bb85f83ed105fe0e389c8dc (diff) | |
Use WTAP_ENCAP_IEEE_802_11_xxx for all the "802.11 plus radio header"
encapsulations.
For pre-V9 AiroPeek captures, leave the radio information in the packet
data, just as we do with the Prism, AVS, radiotap, and NetMon headers.
Add a dissector for it.
svn path=/trunk/; revision=42379
Diffstat (limited to 'wiretap/netmon.c')
| -rw-r--r-- | wiretap/netmon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 53563dedff..d6d179e34f 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -155,7 +155,7 @@ 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, but format 2.x uses it for IP-over-IEEE 1394 */ - WTAP_ENCAP_IEEE802_11_NETMON_RADIO, + WTAP_ENCAP_IEEE_802_11_NETMON, /* NDIS "DIX", but format 2.x uses it for 802.11 */ WTAP_ENCAP_RAW_IP, /* NDIS ARCNET raw, but format 2.x uses it for "Tunneling interfaces" */ WTAP_ENCAP_RAW_IP, /* NDIS ARCNET 878.2, but format 2.x uses it for "Wireless WAN" */ @@ -457,7 +457,7 @@ netmon_set_pseudo_header_info(int pkt_encap, pseudo_header->eth.fcs_len = 0; break; - case WTAP_ENCAP_IEEE802_11_NETMON_RADIO: + case WTAP_ENCAP_IEEE_802_11_NETMON: /* * It appears to be the case that management * frames have an FCS and data frames don't; |