lkml.org 
[lkml]   [2015]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2 065/124] mac80211: allow null chandef in tracing
    Date
    4.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arik Nemtsov <arik@wizery.com>

    commit 254d3dfe445f94a764e399ca12e04365ac9413ed upstream.

    In TDLS channel-switch operations the chandef can sometimes be NULL.
    Avoid an oops in the trace code for these cases and just print a
    chandef full of zeros.

    Fixes: a7a6bdd0670fe ("mac80211: introduce TDLS channel switch ops")
    Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/mac80211/trace.h | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/net/mac80211/trace.h
    +++ b/net/mac80211/trace.h
    @@ -33,11 +33,11 @@
    __field(u32, chan_width) \
    __field(u32, center_freq1) \
    __field(u32, center_freq2)
    -#define CHANDEF_ASSIGN(c) \
    - __entry->control_freq = (c)->chan ? (c)->chan->center_freq : 0; \
    - __entry->chan_width = (c)->width; \
    - __entry->center_freq1 = (c)->center_freq1; \
    - __entry->center_freq2 = (c)->center_freq2;
    +#define CHANDEF_ASSIGN(c) \
    + __entry->control_freq = (c) ? ((c)->chan ? (c)->chan->center_freq : 0) : 0; \
    + __entry->chan_width = (c) ? (c)->width : 0; \
    + __entry->center_freq1 = (c) ? (c)->center_freq1 : 0; \
    + __entry->center_freq2 = (c) ? (c)->center_freq2 : 0;
    #define CHANDEF_PR_FMT " control:%d MHz width:%d center: %d/%d MHz"
    #define CHANDEF_PR_ARG __entry->control_freq, __entry->chan_width, \
    __entry->center_freq1, __entry->center_freq2



    \
     
     \ /
      Last update: 2015-12-07 16:21    [W:3.604 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site