| commit | dd13aed7ac4c745a02e23b8e0d99c049fcb2256c | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Sep 09 11:40:10 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Sep 09 11:40:09 2013 -0700 |
| tree | d55579ecfa2de3638d0d7960ecd2a578cf5ce8d7 | |
| parent | da1f4863983ded174c1eb986577d0c7d55a93ca4 [diff] | |
| parent | c7c6d0dc9be69a97eb12cd8b185c13b235a5cdd4 [diff] |
Merge "cfg80211: Reset beacon interval when stop AP fails"
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 16df20c..7db02f3 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c
@@ -2408,8 +2408,8 @@ return -ENOENT; err = rdev->ops->stop_ap(&rdev->wiphy, dev); - if (!err) - wdev->beacon_interval = 0; + wdev->beacon_interval = 0; + return err; }