Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 45 insertions, 0 deletions

diff --git a/epan/dissectors/packet-ieee80211-radio.h b/epan/dissectors/packet-ieee80211-radio.h
new file mode 100644
index 00000000..705915d2
--- /dev/null
+++ b/epan/dissectors/packet-ieee80211-radio.h
@@ -0,0 +1,45 @@
+/* packet-ieee80211-radio.h
+ * Routines for pseudo 802.11 header dissection and radio packet timing calculation
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * Copyright 2012 Parc Inc and Samsung Electronics
+ * Copyright 2015, 2016 & 2017 Cisco Inc
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef __WLAN_RADIO_H__
+#define __WLAN_RADIO_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+struct aggregate {
+  guint phy;
+  union ieee_802_11_phy_info phy_info;
+  gint8 rssi; /* sometimes only available on the last frame */
+  guint duration; /* total duration of data in microseconds (without preamble) */
+};
+
+struct wlan_radio {
+  struct aggregate *aggregate; /* if this frame is part of an aggregate, point to it, otherwise NULL */
+  guint prior_aggregate_data; /* length of all prior data in this aggregate
+                                 used for calculating duration of this subframe */
+  guint64 start_tsf;
+  guint64 end_tsf;
+
+  gint64 ifs; /* inter frame space in microseconds */
+
+  guint16 nav; /* Duration from the frame header */
+  gint8 rssi;
+};
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __WLAN_RADIO_H__ */