diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-01-27 11:07:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-22 12:41:26 -0800 |
| commit | bd5bcc09d807fcb6b6dc8495f51f34941f7fd0b1 (patch) | |
| tree | 703eec87caa0b90e923d7361a499b602b8db891e /net | |
| parent | 7cde93f4f7623d0b0dbe93edbd329d22a1ebcc78 (diff) | |
| download | linux-3.10-bd5bcc09d807fcb6b6dc8495f51f34941f7fd0b1.tar.gz linux-3.10-bd5bcc09d807fcb6b6dc8495f51f34941f7fd0b1.tar.bz2 linux-3.10-bd5bcc09d807fcb6b6dc8495f51f34941f7fd0b1.zip | |
mac80211: release the channel in error path in start_ap
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/cfg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 5a1e1caa032..e922bf3f422 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -975,8 +975,10 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, IEEE80211_P2P_OPPPS_ENABLE_BIT; err = ieee80211_assign_beacon(sdata, ¶ms->beacon); - if (err < 0) + if (err < 0) { + ieee80211_vif_release_channel(sdata); return err; + } changed |= err; err = drv_start_ap(sdata->local, sdata); @@ -985,6 +987,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; } |