diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-04-29 17:52:36 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-04-29 17:59:19 +0200 |
| commit | 2fd0511556538a2d713e7a3d032c51cfe0117642 (patch) | |
| tree | 52eab33a88470d742652056bc66b8926da8f73ab /net/wireless | |
| parent | f55ee0834247c88cb6981cb11eb1870392878371 (diff) | |
| download | blackbird-op-linux-2fd0511556538a2d713e7a3d032c51cfe0117642.tar.gz blackbird-op-linux-2fd0511556538a2d713e7a3d032c51cfe0117642.zip | |
cfg80211: remove BUG_ON usage
These really can't trigger unless somebody messes up the code,
but don't make debugging it needlessly complicated, WARN and
return instead of BUG_ON().
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/core.c | 2 | ||||
| -rw-r--r-- | net/wireless/sme.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index b3ff3697239a..f509da4d9be9 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -690,7 +690,7 @@ void wiphy_unregister(struct wiphy *wiphy) rtnl_lock(); rdev->wiphy.registered = false; - BUG_ON(!list_empty(&rdev->wdev_list)); + WARN_ON(!list_empty(&rdev->wdev_list)); /* * First remove the hardware from everywhere, this makes diff --git a/net/wireless/sme.c b/net/wireless/sme.c index e2923a3f2e5c..4bc21a2b1989 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -149,7 +149,8 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev) case CFG80211_CONN_SCAN_AGAIN: return cfg80211_conn_scan(wdev); case CFG80211_CONN_AUTHENTICATE_NEXT: - BUG_ON(!rdev->ops->auth); + if (WARN_ON(!rdev->ops->auth)) + return -EOPNOTSUPP; wdev->conn->state = CFG80211_CONN_AUTHENTICATING; return cfg80211_mlme_auth(rdev, wdev->netdev, params->channel, params->auth_type, @@ -161,7 +162,8 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev) case CFG80211_CONN_AUTH_FAILED: return -ENOTCONN; case CFG80211_CONN_ASSOCIATE_NEXT: - BUG_ON(!rdev->ops->assoc); + if (WARN_ON(!rdev->ops->assoc)) + return -EOPNOTSUPP; wdev->conn->state = CFG80211_CONN_ASSOCIATING; if (wdev->conn->prev_bssid_valid) req.prev_bssid = wdev->conn->prev_bssid; |
