From patchwork Wed Apr 2 09:58:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 336300 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 E0BD7140104 for ; Wed, 2 Apr 2014 20:59:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758400AbaDBJ65 (ORCPT ); Wed, 2 Apr 2014 05:58:57 -0400 Received: from mail-bk0-f51.google.com ([209.85.214.51]:58072 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758197AbaDBJ6y (ORCPT ); Wed, 2 Apr 2014 05:58:54 -0400 Received: by mail-bk0-f51.google.com with SMTP id 6so11088bkj.24 for ; Wed, 02 Apr 2014 02:58:53 -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=RjmZWcmvscehMrlRQyE9JZFj54mclqSbYQCwwMSRCmM=; b=Aj1f1DEgZem4D6S9tBlgzCpmKJ9rRjLTqQ4CZ5ENvOqB6FSs9kJSnkwpUeK8mUUzjm iCzQhMj99WGb2k7b2FIstI9vfQh+kizOOm/8ql6FOMmD/j26HrKK5FY6bVHbBhNIE1IY FUr5l4WnNvsIyx8ICJE8Cg3UoLrd2ZOgzpRk58hkKik2/tkp8I70w9OikrsLhiEigPQL YqaGTgofXj604ReOPCx1eGcYloHf+ZXx+HNcmcBA3QEHuPGnAMQE61QNSaL+xILrMf/2 vwaBll/p/snU7x5f67XOfXlzdJy6D90zJEd/mMcJkBcg2iKeYIFATRu4XhI5CMlqZuo8 FB2Q== X-Received: by 10.205.46.196 with SMTP id up4mr190474bkb.40.1396432732949; Wed, 02 Apr 2014 02:58:52 -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.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Apr 2014 02:58:52 -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 4/4] brcmfmac: set NET_NAME_USER for P2P ifs Date: Wed, 2 Apr 2014 11:58:26 +0200 Message-Id: <1396432706-14470-5-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 Netdevs created via nl80211 (currently only P2P ifs) have names provided by user-space. Therefore, set the naming-policy to NET_NAME_USER so it is correctly shown in sysfs. Signed-off-by: David Herrmann Acked-by: Arend van Spriel Acked-by: Tom Gundersen Acked-by: Kay Sievers --- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c index f3445ac..f721ed6 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c @@ -2308,6 +2308,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name, goto fail; } + ifp->ndev->name_assign_type = NET_NAME_USER; strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1); err = brcmf_net_attach(ifp, true); if (err) {