diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-29 17:08:56 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-30 00:09:25 +0000 |
| commit | aff087af98ec27eced9bf19e3c72278365096a56 (patch) | |
| tree | e9c6d6010723cdb2665d0676b27961cc87843f25 /wiretap/wtap.h | |
| parent | 8165448504749c0a0554e2eef1964f6c88bad15d (diff) | |
| download | wireshark-aff087af98ec27eced9bf19e3c72278365096a56.tar.gz | |
Handle the MCS index in Peek tagged files.
Use the "MCS index used" extended flag bit to indicate whether the "data
rate or MCS index" field is a data rate or MCS index.
Display the MCS index value if it's present.
(More to come - MCS indices, plus other information, should be used to
calculate the data rate for 11n and beyond.)
Get rid of the hdr_info_t structure while we're at it; just use local
variables for each of the fields.
Change-Id: I546f53a8ebd89078d5f23e1290557b97348aff38
Reviewed-on: https://code.wireshark.org/review/4988
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/wtap.h')
| -rw-r--r-- | wiretap/wtap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 2de3363ecd..3a93c844db 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -586,7 +586,7 @@ struct ieee_802_11_phdr { gboolean decrypted; /* TRUE if frame is decrypted even if "protected" bit is set */ guint16 channel; /* Channel number */ guint16 data_rate; /* Data rate, in .5 Mb/s units */ - guint16 mcs; /* MCS index */ + guint16 mcs_index; /* MCS index */ guint32 frequency; /* Channel center frequency */ guint8 signal_percent; /* Signal level, as a percentage */ guint8 noise_percent; /* Noise level, as a percentage */ @@ -597,7 +597,7 @@ struct ieee_802_11_phdr { #define PHDR_802_11_HAS_CHANNEL 0x00000001 /* channel */ #define PHDR_802_11_HAS_DATA_RATE 0x00000002 /* data_rate */ -#define PHDR_802_11_HAS_MCS 0x00000004 /* mcs_index */ +#define PHDR_802_11_HAS_MCS_INDEX 0x00000004 /* mcs_index */ #define PHDR_802_11_HAS_FREQUENCY 0x00000008 /* frequency */ #define PHDR_802_11_HAS_SIGNAL_PERCENT 0x00000010 /* signal_percent */ #define PHDR_802_11_HAS_NOISE_PERCENT 0x00000020 /* noise_percent */ |