path: root/net/wireless
diff options
authorJohannes Berg <johannes.berg@intel.com>2013-06-04 22:23:36 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-06-04 22:28:23 +0200
commit9b881963c1c81f965f89a3e89b1aa5557f67ee30 (patch)
tree6a0b36057cc217b138fb9fc27155ae193729972a /net/wireless
parent256c90dedf538c59c70e65ba1a1340ce793c5b37 (diff)
cfg80211: make wiphy index start at 0 again
The change to use atomic_inc_return() for assigning the wiphy index made the first wiphy index 1 instead of 0. This is fine, but we all habitually type "phy0" when we're testing, so make it go back to 0 instead of 1 by subtracting 1 from the index. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 99d86ddb6331..4224e7554a76 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -301,6 +301,9 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv)
return NULL;
+ /* atomic_inc_return makes it start at 1, make it start at 0 */
+ rdev->wiphy_idx--;
/* give it a proper name */
dev_set_name(&rdev->wiphy.dev, PHY_NAME "%d", rdev->wiphy_idx);

Privacy Policy