From patchwork Mon Mar 17 19:42:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 3846081 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CB237BF540 for ; Mon, 17 Mar 2014 19:43:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D310D20218 for ; Mon, 17 Mar 2014 19:43:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE85420212 for ; Mon, 17 Mar 2014 19:43:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751394AbaCQTnK (ORCPT ); Mon, 17 Mar 2014 15:43:10 -0400 Received: from mail-bk0-f48.google.com ([209.85.214.48]:32971 "EHLO mail-bk0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751325AbaCQTnA (ORCPT ); Mon, 17 Mar 2014 15:43:00 -0400 Received: by mail-bk0-f48.google.com with SMTP id mx12so411798bkb.7 for ; Mon, 17 Mar 2014 12:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dm6x57+juXu1wLnf4xKWhsyN9c6byHx7dkVS7P/+KEE=; b=SJ9uZALKYLaohWOsTfX4fcScKAp5ayBsi6umi38gtrnBj9PUCL+EUjTZE2JqEQT+qi 09cJnFaayHrRHfngDkkmxJZ9kyNA0PIWrV54gVihiwj7B9+hlT0HC6tXBdtRxgqJQWiN YHtoLskKlmEoS6sD8FMdAGSMep3IqfbZwUX8iRskwuIXJ/1SLezRM8JdGtxS6iN5Utuc s9gbDUZemzMVcY24MUSClHOPuhphVKvSynVoX3ZGyWgizoyPKP5DJMGZoGygSpflQTMX AtMMNZDnt4NZGyoUznKh7NVJQg8nDSe4EIQbYiH04qwotHuWrSTwFGnwNnqIvRKFkCep 8/fg== X-Received: by 10.205.43.130 with SMTP id uc2mr11763230bkb.9.1395085378453; Mon, 17 Mar 2014 12:42:58 -0700 (PDT) Received: from david-tp.localdomain (stgt-5f716d13.pool.mediaWays.net. [95.113.109.19]) by mx.google.com with ESMTPSA id z3sm14440745bkn.3.2014.03.17.12.42.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Mar 2014 12:42:57 -0700 (PDT) From: David Herrmann To: netdev@vger.kernel.org Cc: "David S. Miller" , Tom Gundersen , Johannes berg , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, David Herrmann , Johannes Berg Subject: [PATCH v4 2/4] mac80211: set NET_NAME_USER for user-space created ifs Date: Mon, 17 Mar 2014 20:42:36 +0100 Message-Id: <1395085358-1171-3-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1395085358-1171-1-git-send-email-dh.herrmann@gmail.com> References: <1395085358-1171-1-git-send-email-dh.herrmann@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The nl80211 interface allows creating new netdevs from user-space. The name is *always* provided by user-space, so we should set NET_NAME_USER to provide that information via sysfs. But we must not set it for the default wlan%d names as these are kernel-provided names. This allows udev to not rename dynamically created wifi devices (like wifi P2P devices). Cc: Johannes Berg Signed-off-by: David Herrmann Acked-by: Tom Gundersen --- net/mac80211/cfg.c | 2 +- net/mac80211/ieee80211_i.h | 1 + net/mac80211/iface.c | 2 ++ net/mac80211/main.c | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 1acb291..34f10fe 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -31,7 +31,7 @@ static struct wireless_dev *ieee80211_add_iface(struct wiphy *wiphy, struct ieee80211_sub_if_data *sdata; int err; - err = ieee80211_if_add(local, name, &wdev, type, params); + err = ieee80211_if_add(local, name, NET_NAME_USER, &wdev, type, params); if (err) return ERR_PTR(err); diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 0d1a0f8..96f453a 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1469,6 +1469,7 @@ int ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, int ieee80211_iface_init(void); void ieee80211_iface_exit(void); int ieee80211_if_add(struct ieee80211_local *local, const char *name, + unsigned char name_assign_type, struct wireless_dev **new_wdev, enum nl80211_iftype type, struct vif_params *params); int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index b8d331e..fe84853 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1574,6 +1574,7 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local, } int ieee80211_if_add(struct ieee80211_local *local, const char *name, + unsigned char name_assign_type, struct wireless_dev **new_wdev, enum nl80211_iftype type, struct vif_params *params) { @@ -1617,6 +1618,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; + ndev->name_assign_type = name_assign_type; ret = dev_alloc_name(ndev, ndev->name); if (ret < 0) { free_netdev(ndev); diff --git a/net/mac80211/main.c b/net/mac80211/main.c index b055f6a5..ee32a83 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1012,7 +1012,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) /* add one default STA interface if supported */ if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION)) { - result = ieee80211_if_add(local, "wlan%d", NULL, + result = ieee80211_if_add(local, "wlan%d", NET_NAME_ENUM, NULL, NL80211_IFTYPE_STATION, NULL); if (result) wiphy_warn(local->hw.wiphy,