浏览代码

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: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Johannes Berg 16 年之前
父节点
当前提交
7848547561
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 0 3
      net/wireless/core.c
  2. 4 0
      net/wireless/ibss.c

+ 0 - 3
net/wireless/core.c

@@ -567,9 +567,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
 #endif
 #endif
 		break;
 		break;
 	case NETDEV_GOING_DOWN:
 	case NETDEV_GOING_DOWN:
-		if (!wdev->ssid_len)
-			break;
-
 		switch (wdev->iftype) {
 		switch (wdev->iftype) {
 		case NL80211_IFTYPE_ADHOC:
 		case NL80211_IFTYPE_ADHOC:
 			cfg80211_leave_ibss(rdev, dev, true);
 			cfg80211_leave_ibss(rdev, dev, true);

+ 4 - 0
net/wireless/ibss.c

@@ -92,8 +92,12 @@ void cfg80211_clear_ibss(struct net_device *dev, bool nowext)
 int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
 int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
 			struct net_device *dev, bool nowext)
 			struct net_device *dev, bool nowext)
 {
 {
+	struct wireless_dev *wdev = dev->ieee80211_ptr;
 	int err;
 	int err;
 
 
+	if (!wdev->ssid_len)
+		return -ENOLINK;
+
 	err = rdev->ops->leave_ibss(&rdev->wiphy, dev);
 	err = rdev->ops->leave_ibss(&rdev->wiphy, dev);
 
 
 	if (err)
 	if (err)