lkml.org 
[lkml]   [2020]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 118/130] cfg80211: Save the regulatory domain when setting custom regulatory
    Date
    From: Ilan Peer <ilan.peer@intel.com>

    [ Upstream commit beee246951571cc5452176f3dbfe9aa5a10ba2b9 ]

    When custom regulatory was set, only the channels setting was updated, but
    the regulatory domain was not saved. Fix it by saving it.

    Signed-off-by: Ilan Peer <ilan.peer@intel.com>
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Link: https://lore.kernel.org/r/iwlwifi.20201129172929.290fa5c5568a.Ic5732aa64de6ee97ae3578bd5779fc723ba489d1@changeid
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/wireless/reg.c | 8 ++++++++
    1 file changed, 8 insertions(+)

    diff --git a/net/wireless/reg.c b/net/wireless/reg.c
    index 0f3b57a73670b..e79d45f0ec232 100644
    --- a/net/wireless/reg.c
    +++ b/net/wireless/reg.c
    @@ -2339,6 +2339,7 @@ static void handle_band_custom(struct wiphy *wiphy,
    void wiphy_apply_custom_regulatory(struct wiphy *wiphy,
    const struct ieee80211_regdomain *regd)
    {
    + const struct ieee80211_regdomain *new_regd, *tmp;
    enum nl80211_band band;
    unsigned int bands_set = 0;

    @@ -2358,6 +2359,13 @@ void wiphy_apply_custom_regulatory(struct wiphy *wiphy,
    * on your device's supported bands.
    */
    WARN_ON(!bands_set);
    + new_regd = reg_copy_regd(regd);
    + if (IS_ERR(new_regd))
    + return;
    +
    + tmp = get_wiphy_regdom(wiphy);
    + rcu_assign_pointer(wiphy->regd, new_regd);
    + rcu_free_regdom(tmp);
    }
    EXPORT_SYMBOL(wiphy_apply_custom_regulatory);

    --
    2.27.0
    \
     
     \ /
      Last update: 2020-12-23 03:53    [W:4.231 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site