Skip to contentSkip to conversation

cfg80211: fix wireless handlers assignment

PATCH In review Johannes Berg 2 participants 2 messages Sep 28, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 cfg80211: fix wireless handlers assignment

The point we assign dev->wireless_handlers at is too late, we need to do that before netdev_register_kobject() gets called, so use the new NETDEV_PRE_INIT notifier. The result of adding wireless_handlers too late is the disappearance of /sys/class/net/wlan0/wireless which a bunch of distro scripts still require.

---
 net/wireless/core.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
net/wireless/core.c +6 -2
@@ -641,6 +641,12 @@ static int cfg80211_netdev_notifier_call
 	WARN_ON(wdev->iftype == NL80211_IFTYPE_UNSPECIFIED);
 
 	switch (state) {
+	case NETDEV_POST_INIT:
+#ifdef CONFIG_WIRELESS_EXT
+		if (!dev->wireless_handlers)
+			dev->wireless_handlers = &cfg80211_wext_handler;
+#endif
+		break;
 	case NETDEV_REGISTER:
 		/*
 		 * NB: cannot take rdev->mtx here because this may be
@@ -666,8 +672,6 @@ static int cfg80211_netdev_notifier_call
 		wdev->sme_state = CFG80211_SME_IDLE;
 		mutex_unlock(&rdev->devlist_mtx);
 #ifdef CONFIG_WIRELESS_EXT
-		if (!dev->wireless_handlers)
-			dev->wireless_handlers = &cfg80211_wext_handler;
 		wdev->wext.default_key = -1;
 		wdev->wext.default_mgmt_key = -1;
 		wdev->wext.connect.auth_type = NL80211_AUTHTYPE_AUTOMATIC;

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer
#1 lore raw
Quoted 6 lines · Johannes Berg

The point we assign dev->wireless_handlers at is too late, we need to do that before netdev_register_kobject() gets called, so use the new NETDEV_PRE_INIT notifier. The result of adding wireless_handlers too late is the disappearance of /sys/class/net/wlan0/wireless which a bunch of distro scripts still require.

Ignore please, I have a better, self-contained fix.

johannes