diff --git a/net/wireless/core.c b/net/wireless/core.c
index 99d86ddb6331a7f31d05aafef91c6acb35fc2d7f..4224e7554a769ed7a9e3d1ea9a7f6b7cb2a38d54 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);