From patchwork Fri Sep 24 22:21:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 207682 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8OMMfJL016815 for ; Fri, 24 Sep 2010 22:22:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758306Ab0IXWWL (ORCPT ); Fri, 24 Sep 2010 18:22:11 -0400 Received: from mail.candelatech.com ([208.74.158.172]:59287 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758302Ab0IXWWK (ORCPT ); Fri, 24 Sep 2010 18:22:10 -0400 Received: from [192.168.100.195] (firewall.candelatech.com [70.89.124.249]) (authenticated bits=0) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id o8OMLxk5030443 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 24 Sep 2010 15:22:00 -0700 Message-ID: <4C9D2487.5040202@candelatech.com> Date: Fri, 24 Sep 2010 15:21:59 -0700 From: Ben Greear Organization: Candela Technologies User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100430 Fedora/3.0.4-2.fc11 Thunderbird/3.0.4 MIME-Version: 1.0 To: Johannes Berg CC: linux-wireless@vger.kernel.org, "John W. Linville" Subject: Re: [wireless] wireless: Keep phy name consistent across module reloads. References: <1285113431-25526-1-git-send-email-greearb@candelatech.com> <1285362170.11036.1.camel@jlt3.sipsolutions.net> <4C9D13AC.4080308@candelatech.com> <1285363135.11036.7.camel@jlt3.sipsolutions.net> <4C9D1760.3040103@candelatech.com> <1285363861.11036.8.camel@jlt3.sipsolutions.net> In-Reply-To: <1285363861.11036.8.camel@jlt3.sipsolutions.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 24 Sep 2010 22:22:42 +0000 (UTC) diff --git a/net/wireless/core.c b/net/wireless/core.c index 8226ba7..312a44b 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -319,9 +319,12 @@ static void cfg80211_event_work(struct work_struct *work) struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv) { + static int wiphy_counter; int i; - struct cfg80211_registered_device *rdev; + struct cfg80211_registered_device *rdev, *rdev2; int alloc_size; + char nname[IFNAMSIZ + 1]; + bool found = false; WARN_ON(ops->add_key && (!ops->del_key || !ops->set_default_key)); WARN_ON(ops->auth && (!ops->assoc || !ops->deauth || !ops->disassoc)); @@ -341,26 +344,38 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv) mutex_lock(&cfg80211_mutex); + rdev->wiphy_idx = wiphy_counter++; + + if (unlikely(!wiphy_idx_valid(rdev->wiphy_idx))) + goto too_many_devs; + /* 64k wiphy devices is enough for anyone! */ for (i = 0; i < 0xFFFF; i++) { - if (!cfg80211_rdev_by_wiphy_idx(i)) + found = false; + snprintf(nname, sizeof(nname)-1, PHY_NAME "%d", i); + nname[sizeof(nname)-1] = 0; + list_for_each_entry(rdev2, &cfg80211_rdev_list, list) + if (strcmp(nname, dev_name(&rdev2->wiphy.dev)) == 0) { + found = true; + break; + } + + if (!found) break; } - if (i == 0xFFFF) - i = -1; /* invalid */ - rdev->wiphy_idx = i; - if (unlikely(!wiphy_idx_valid(rdev->wiphy_idx))) { + if (unlikely(found)) { +too_many_devs: mutex_unlock(&cfg80211_mutex); /* ugh, too many devices already! */ kfree(rdev); return NULL; } - mutex_unlock(&cfg80211_mutex); - /* give it a proper name */ - dev_set_name(&rdev->wiphy.dev, PHY_NAME "%d", rdev->wiphy_idx); + dev_set_name(&rdev->wiphy.dev, "%s", nname); + + mutex_unlock(&cfg80211_mutex); mutex_init(&rdev->mtx); mutex_init(&rdev->devlist_mtx);