Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fd05115 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent f55ee083

net/wireless/core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

net/wireless/sme.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -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;