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

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

cfg80211: fix netdev down problem 



We shouldn't be looking at the ssid_len for non-IBSS,
and for IBSS we should also return an error on trying
to leave an IBSS while not in or joining an IBSS.

This fixes an issue where we wouldn't disconnect() on
an interface being taken down since there's no SSID
configured this way.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c9cf0122

net/wireless/core.c

+0 −3
Original line number Diff line number Diff line
@@ -567,9 +567,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
#endif

		break;

	case NETDEV_GOING_DOWN:

		if (!wdev->ssid_len)

			break;



		switch (wdev->iftype) {

		case NL80211_IFTYPE_ADHOC:

			cfg80211_leave_ibss(rdev, dev, true);

net/wireless/ibss.c

+4 −0
Original line number Diff line number Diff line
@@ -92,8 +92,12 @@ void cfg80211_clear_ibss(struct net_device *dev, bool nowext) 
int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,

			struct net_device *dev, bool nowext)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

	int err;



	if (!wdev->ssid_len)

		return -ENOLINK;



	err = rdev->ops->leave_ibss(&rdev->wiphy, dev);



	if (err)