From patchwork Sun Sep 27 18:27:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 34354 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 9D66CB7BDE for ; Mon, 28 Sep 2009 04:28:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751905AbZI0S1z (ORCPT ); Sun, 27 Sep 2009 14:27:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751431AbZI0S1y (ORCPT ); Sun, 27 Sep 2009 14:27:54 -0400 Received: from xc.sipsolutions.net ([83.246.72.84]:40784 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750803AbZI0S1y (ORCPT ); Sun, 27 Sep 2009 14:27:54 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1MryTV-0002b3-6n; Sun, 27 Sep 2009 20:27:57 +0200 Subject: [PATCH 2/2] cfg80211: fix wireless handlers assignment From: Johannes Berg To: netdev Cc: linux-wireless , Hugh Dickins Date: Sun, 27 Sep 2009 20:27:55 +0200 Message-Id: <1254076075.6583.6.camel@johannes.local> Mime-Version: 1.0 X-Mailer: Evolution 2.28.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. Signed-off-by: Johannes Berg --- This should fix the regression Hugh reported (of course requires the other patch which unfortunately I forgot to CC you, Hugh, I'll send you a copy in private). net/wireless/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- wireless-testing.orig/net/wireless/core.c 2009-09-27 15:12:20.000000000 +0200 +++ wireless-testing/net/wireless/core.c 2009-09-27 15:12:54.000000000 +0200 @@ -641,6 +641,12 @@ static int cfg80211_netdev_notifier_call WARN_ON(wdev->iftype == NL80211_IFTYPE_UNSPECIFIED); switch (state) { + case NETDEV_PRE_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;