lkml.org 
[lkml]   [2014]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 033/228] cfg80211: add cfg80211_sched_scan_stopped_rtnl
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Eliad Peller <eliad@wizery.com>

    commit 792e6aa7a15ea0fb16f8687e93caede1ea9118c7 upstream.

    Add locked-version for cfg80211_sched_scan_stopped.
    This is used for some users that might want to
    call it when rtnl is already locked.

    Fixes: d43c6b6 ("mac80211: reschedule sched scan after HW restart")
    Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/net/cfg80211.h | 12 ++++++++++++
    net/wireless/scan.c | 12 ++++++++++--
    2 files changed, 22 insertions(+), 2 deletions(-)

    --- a/include/net/cfg80211.h
    +++ b/include/net/cfg80211.h
    @@ -3637,6 +3637,18 @@ void cfg80211_sched_scan_results(struct
    void cfg80211_sched_scan_stopped(struct wiphy *wiphy);

    /**
    + * cfg80211_sched_scan_stopped_rtnl - notify that the scheduled scan has stopped
    + *
    + * @wiphy: the wiphy on which the scheduled scan stopped
    + *
    + * The driver can call this function to inform cfg80211 that the
    + * scheduled scan had to be stopped, for whatever reason. The driver
    + * is then called back via the sched_scan_stop operation when done.
    + * This function should be called with rtnl locked.
    + */
    +void cfg80211_sched_scan_stopped_rtnl(struct wiphy *wiphy);
    +
    +/**
    * cfg80211_inform_bss_width_frame - inform cfg80211 of a received BSS frame
    *
    * @wiphy: the wiphy reporting the BSS
    --- a/net/wireless/scan.c
    +++ b/net/wireless/scan.c
    @@ -284,14 +284,22 @@ void cfg80211_sched_scan_results(struct
    }
    EXPORT_SYMBOL(cfg80211_sched_scan_results);

    -void cfg80211_sched_scan_stopped(struct wiphy *wiphy)
    +void cfg80211_sched_scan_stopped_rtnl(struct wiphy *wiphy)
    {
    struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);

    + ASSERT_RTNL();
    +
    trace_cfg80211_sched_scan_stopped(wiphy);

    - rtnl_lock();
    __cfg80211_stop_sched_scan(rdev, true);
    +}
    +EXPORT_SYMBOL(cfg80211_sched_scan_stopped_rtnl);
    +
    +void cfg80211_sched_scan_stopped(struct wiphy *wiphy)
    +{
    + rtnl_lock();
    + cfg80211_sched_scan_stopped_rtnl(wiphy);
    rtnl_unlock();
    }
    EXPORT_SYMBOL(cfg80211_sched_scan_stopped);



    \
     
     \ /
      Last update: 2014-06-05 16:41    [W:4.125 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site