These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / wireless / ath / ath10k / trace.h

diff --git a/kernel/drivers/net/wireless/ath/ath10k/trace.h b/kernel/drivers/net/wireless/ath/ath10k/trace.h
index 5407887..71bdb36 100644 (file)
--- a/kernel/drivers/net/wireless/ath/ath10k/trace.h
+++ b/kernel/drivers/net/wireless/ath/ath10k/trace.h
@@ -21,11 +21,16 @@
 #include "core.h"
 
 #if !defined(_TRACE_H_)
-static inline u32 ath10k_frm_hdr_len(const void *buf)
+static inline u32 ath10k_frm_hdr_len(const void *buf, size_t len)
 {
        const struct ieee80211_hdr *hdr = buf;
 
-       return ieee80211_hdrlen(hdr->frame_control);
+       /* In some rare cases (e.g. fcs error) device reports frame buffer
+        * shorter than what frame header implies (e.g. len = 0). The buffer
+        * can still be accessed so do a simple min() to guarantee caller
+        * doesn't get value greater than len.
+        */
+       return min_t(u32, len, ieee80211_hdrlen(hdr->frame_control));
 }
 #endif
 
@@ -46,7 +51,7 @@ static inline void trace_ ## name(proto) {}
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM ath10k
 
-#define ATH10K_MSG_MAX 200
+#define ATH10K_MSG_MAX 400
 
 DECLARE_EVENT_CLASS(ath10k_log_event,
        TP_PROTO(struct ath10k *ar, struct va_format *vaf),
@@ -360,13 +365,13 @@ DECLARE_EVENT_CLASS(ath10k_hdr_event,
                __string(device, dev_name(ar->dev))
                __string(driver, dev_driver_string(ar->dev))
                __field(size_t, len)
-               __dynamic_array(u8, data, ath10k_frm_hdr_len(data))
+               __dynamic_array(u8, data, ath10k_frm_hdr_len(data, len))
        ),
 
        TP_fast_assign(
                __assign_str(device, dev_name(ar->dev));
                __assign_str(driver, dev_driver_string(ar->dev));
-               __entry->len = ath10k_frm_hdr_len(data);
+               __entry->len = ath10k_frm_hdr_len(data, len);
                memcpy(__get_dynamic_array(data), data, __entry->len);
        ),
 
@@ -387,15 +392,16 @@ DECLARE_EVENT_CLASS(ath10k_payload_event,
                __string(device, dev_name(ar->dev))
                __string(driver, dev_driver_string(ar->dev))
                __field(size_t, len)
-               __dynamic_array(u8, payload, (len - ath10k_frm_hdr_len(data)))
+               __dynamic_array(u8, payload, (len -
+                                             ath10k_frm_hdr_len(data, len)))
        ),
 
        TP_fast_assign(
                __assign_str(device, dev_name(ar->dev));
                __assign_str(driver, dev_driver_string(ar->dev));
-               __entry->len = len - ath10k_frm_hdr_len(data);
+               __entry->len = len - ath10k_frm_hdr_len(data, len);
                memcpy(__get_dynamic_array(payload),
-                      data + ath10k_frm_hdr_len(data), __entry->len);
+                      data + ath10k_frm_hdr_len(data, len), __entry->len);
        ),
 
        TP_printk(