Commit d4f29978 authored Feb 13, 2017 by Johannes Berg

cfg80211: combine two nested ifs into a single condition



Combine two instances of having two nested if statements
into a single one with a combined condition to reduce the
indentation.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent ae44b502

net/wireless/core.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1216,8 +1216,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
		*/
		if ((wdev->iftype == NL80211_IFTYPE_STATION \|\|
		wdev->iftype == NL80211_IFTYPE_P2P_CLIENT) &&
		rdev->ops->set_power_mgmt)
		if (rdev_set_power_mgmt(rdev, dev, wdev->ps,
		rdev->ops->set_power_mgmt &&
		rdev_set_power_mgmt(rdev, dev, wdev->ps,
		wdev->ps_timeout)) {
		/* assume this means it's off */
		wdev->ps = false;

net/wireless/util.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -914,8 +914,8 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev)
		netdev_err(dev, "failed to set key %d\n", i);
		continue;
		}
		if (wdev->connect_keys->def == i)
		if (rdev_set_default_key(rdev, dev, i, true, true)) {
		if (wdev->connect_keys->def == i &&
		rdev_set_default_key(rdev, dev, i, true, true)) {
		netdev_err(dev, "failed to set defkey %d\n", i);
		continue;
		}