From patchwork Wed Apr 2 09:58:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 336302 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 0C554140104 for ; Wed, 2 Apr 2014 21:00:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758434AbaDBJ7j (ORCPT ); Wed, 2 Apr 2014 05:59:39 -0400 Received: from mail-bk0-f52.google.com ([209.85.214.52]:36114 "EHLO mail-bk0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758342AbaDBJ6w (ORCPT ); Wed, 2 Apr 2014 05:58:52 -0400 Received: by mail-bk0-f52.google.com with SMTP id my13so11190bkb.25 for ; Wed, 02 Apr 2014 02:58:51 -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=Jxa6Eyc8QxzIzNvilYJ1GBFqa7LgBuqlt6gPF0n6oZw=; b=uJuRawXpolKRTvmyGrext00/fITlx8dwY/6w8POdaSHjIAEiAOEXZOket2VTiLdMqi GF5YwhP/e693T3+p8XpFchdgokuZ0mhXp3HKJcmEiOm2udW6OEJMOgtZ2/WscnYS3Wuw OWFQJ+VHVG9KvyhuNGCtpWq+51vwc/QKefbwzrhpcyuCn3Es2s7E5Dq6CfUBleq6NGsx mBMaQgq9uT0nkZiWnd1ar0C6kIjbRYCjSKAatb+tvVMP3egI5mhB9hSZQQLucDp7wPfM SSM2oTBOv1InrRnY81q2AaA9VD2hTc2WRfilrmIdZ+zRZwj+uSFw7nYYVMGqiB/kvQZ+ 1UPw== X-Received: by 10.204.198.8 with SMTP id em8mr189728bkb.32.1396432731113; Wed, 02 Apr 2014 02:58:51 -0700 (PDT) Received: from localhost.localdomain (nat.nue.novell.com. [195.135.221.2]) by mx.google.com with ESMTPSA id el11sm1677744bkb.8.2014.04.02.02.58.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Apr 2014 02:58:50 -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, Kay Sievers , David Herrmann Subject: [PATCH v6 3/4] ath6kl: set NET_NAME_USER for P2P ifs Date: Wed, 2 Apr 2014 11:58:25 +0200 Message-Id: <1396432706-14470-4-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1396432706-14470-1-git-send-email-dh.herrmann@gmail.com> References: <1396432706-14470-1-git-send-email-dh.herrmann@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org P2P netdevs and other devices that are created via nl80211 from user-space have a name provided by user-space. Therefore, set NET_NAME_USER so this is correctly shown in sysfs. Signed-off-by: David Herrmann Acked-by: Kalle Valo Acked-by: Tom Gundersen Acked-by: Kay Sievers --- drivers/net/wireless/ath/ath6kl/cfg80211.c | 5 ++++- drivers/net/wireless/ath/ath6kl/cfg80211.h | 1 + drivers/net/wireless/ath/ath6kl/core.c | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index c2c6f46..131d8ab 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -1512,7 +1512,8 @@ static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy, return ERR_PTR(-EINVAL); } - wdev = ath6kl_interface_add(ar, name, type, if_idx, nw_type); + wdev = ath6kl_interface_add(ar, name, NET_NAME_USER, type, + if_idx, nw_type); if (!wdev) return ERR_PTR(-ENOMEM); @@ -3630,6 +3631,7 @@ void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif) } struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name, + unsigned char name_assign_type, enum nl80211_iftype type, u8 fw_vif_idx, u8 nw_type) { @@ -3666,6 +3668,7 @@ struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name, ndev->dev_addr[4] ^= 0x80; } + ndev->name_assign_type = name_assign_type; init_netdev(ndev); ath6kl_init_control_info(vif); diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.h b/drivers/net/wireless/ath/ath6kl/cfg80211.h index b59becd..5aa57a7 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.h +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.h @@ -25,6 +25,7 @@ enum ath6kl_cfg_suspend_mode { }; struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name, + unsigned char name_assign_type, enum nl80211_iftype type, u8 fw_vif_idx, u8 nw_type); void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq, diff --git a/drivers/net/wireless/ath/ath6kl/core.c b/drivers/net/wireless/ath/ath6kl/core.c index 4b46adb..3cc8145 100644 --- a/drivers/net/wireless/ath/ath6kl/core.c +++ b/drivers/net/wireless/ath/ath6kl/core.c @@ -195,8 +195,8 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type) rtnl_lock(); /* Add an initial station interface */ - wdev = ath6kl_interface_add(ar, "wlan%d", NL80211_IFTYPE_STATION, 0, - INFRA_NETWORK); + wdev = ath6kl_interface_add(ar, "wlan%d", NET_NAME_ENUM, + NL80211_IFTYPE_STATION, 0, INFRA_NETWORK); rtnl_unlock();