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

Commit 8c5d9808 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: fix refcount imbalance when wext is disabled 



When CONFIG_CFG80211_WEXT is not set, there is
a refcount imbalance with rdev->opencount, fix
that by moving it out of the ifdef.

Reported-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 193e70ef

net/wireless/core.c

+2 −2
Original line number Diff line number Diff line
@@ -745,9 +745,9 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
			mutex_unlock(&rdev->devlist_mtx);

			dev_put(dev);

		}

#ifdef CONFIG_CFG80211_WEXT

		cfg80211_lock_rdev(rdev);

		mutex_lock(&rdev->devlist_mtx);

#ifdef CONFIG_CFG80211_WEXT

		wdev_lock(wdev);

		switch (wdev->iftype) {

		case NL80211_IFTYPE_ADHOC:
@@ -760,10 +760,10 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
			break;

		}

		wdev_unlock(wdev);

#endif

		rdev->opencount++;

		mutex_unlock(&rdev->devlist_mtx);

		cfg80211_unlock_rdev(rdev);

#endif

		break;

	case NETDEV_UNREGISTER:

		/*