lkml.org 
[lkml]   [2014]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 071/121] mac80211: release the channel in error path in start_ap
    Date
    3.11.10.5 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

    commit 0297ea17bf7879fb5846fafd1be4c0471e72848d upstream.

    When the driver cannot start the AP or when the assignement
    of the beacon goes wrong, we need to unassign the vif.

    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/mac80211/cfg.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
    index 2116285..216550e9 100644
    --- a/net/mac80211/cfg.c
    +++ b/net/mac80211/cfg.c
    @@ -989,8 +989,10 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
    IEEE80211_P2P_OPPPS_ENABLE_BIT;

    err = ieee80211_assign_beacon(sdata, &params->beacon);
    - if (err < 0)
    + if (err < 0) {
    + ieee80211_vif_release_channel(sdata);
    return err;
    + }
    changed |= err;

    err = drv_start_ap(sdata->local, sdata);
    @@ -999,6 +1001,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
    if (old)
    kfree_rcu(old, rcu_head);
    RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
    + ieee80211_vif_release_channel(sdata);
    return err;
    }

    --
    1.9.0


    \
     
     \ /
      Last update: 2014-02-21 15:21    [W:4.191 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site