Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 14:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

cfg80211: remove BUG_ON usage

Browse Source 
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>
This commit is contained in:
Johannes Berg 2014-04-29 17:52:36 +02:00
parent f55ee08342
commit 2fd0511556
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/wireless/core.c
View File

@ -690,7 +690,7 @@ void wiphy_unregister(struct wiphy *wiphy)
rtnl_lock(); rtnl_lock();
rdev->wiphy.registered = false; 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 * First remove the hardware from everywhere, this makes

6
net/wireless/sme.c
View File

@ -149,7 +149,8 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev)
case CFG80211_CONN_SCAN_AGAIN: case CFG80211_CONN_SCAN_AGAIN:
return cfg80211_conn_scan(wdev); return cfg80211_conn_scan(wdev);
case CFG80211_CONN_AUTHENTICATE_NEXT: case CFG80211_CONN_AUTHENTICATE_NEXT:
BUG_ON(!rdev->ops->auth); if (WARN_ON(!rdev->ops->auth))
return -EOPNOTSUPP;
wdev->conn->state = CFG80211_CONN_AUTHENTICATING; wdev->conn->state = CFG80211_CONN_AUTHENTICATING;
return cfg80211_mlme_auth(rdev, wdev->netdev, return cfg80211_mlme_auth(rdev, wdev->netdev,
params->channel, params->auth_type, params->channel, params->auth_type,
@ -161,7 +162,8 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev)
case CFG80211_CONN_AUTH_FAILED: case CFG80211_CONN_AUTH_FAILED:
return -ENOTCONN; return -ENOTCONN;
case CFG80211_CONN_ASSOCIATE_NEXT: case CFG80211_CONN_ASSOCIATE_NEXT:
BUG_ON(!rdev->ops->assoc); if (WARN_ON(!rdev->ops->assoc))
return -EOPNOTSUPP;
wdev->conn->state = CFG80211_CONN_ASSOCIATING; wdev->conn->state = CFG80211_CONN_ASSOCIATING;
if (wdev->conn->prev_bssid_valid) if (wdev->conn->prev_bssid_valid)
req.prev_bssid = wdev->conn->prev_bssid; req.prev_bssid = wdev->conn->prev_bssid;