diff options
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 18c0052f3c..1c4e7bd397 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -10940,7 +10940,8 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, guint8 algorithm=G_MAXUINT8; /* Davide Schiera (2006-11-27): added macros to check the algorithm */ /* used could be TKIP or CCMP */ -#define IS_TKIP(tvb, hdr_len) (tvb_get_guint8(tvb, hdr_len + 1) & 0x20) +#define IS_TKIP(tvb, hdr_len) (tvb_get_guint8(tvb, hdr_len + 1) == \ + ((tvb_get_guint8(tvb, hdr_len) | 0x20) & 0x7f)) #define IS_CCMP(tvb, hdr_len) (tvb_get_guint8(tvb, hdr_len + 2) == 0) /* Davide Schiera ----------------------------------------------------- */ |