From patchwork Wed Mar 26 13:05:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 333876 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 D94C614003E for ; Thu, 27 Mar 2014 00:07:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754784AbaCZNGU (ORCPT ); Wed, 26 Mar 2014 09:06:20 -0400 Received: from mail-bk0-f43.google.com ([209.85.214.43]:50432 "EHLO mail-bk0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754697AbaCZNFs (ORCPT ); Wed, 26 Mar 2014 09:05:48 -0400 Received: by mail-bk0-f43.google.com with SMTP id v15so520875bkz.16 for ; Wed, 26 Mar 2014 06:05:47 -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=1Ttix7gJaMekwEvMGZQKQlr4a+Ggj8tMvYES64bOvRU=; b=RapYX37ZNvXnSzfD1qm1sM0evBbuAnlvIk3upo8JCNUh+8zr414qccbWqV5/nYTV8I XdRzqjrpPOzYwptN+gLbjcCKaFxecOKNE0077+skDPlQ0mNNnYgeRfDu4zCCcLuDQLN3 qxn5lZ846KetN2yHjm39IUvyXslmKP3BRqPrza83ioYAeCwpoVtCKlT1SrhKYT1LlRnx LKx3Yd3wCMfV+DbePl8iKyRKNwY/af05h4k4FuyMGpAG1io4K7n9PMR51RHa3ZX6QIxy 3vzZ6MtSff4wIhtb9gtGzj3xfzRGgxbR+kfaCUk0uHc/NOd5HKn54th9wQKHJtZ/rNzQ bEYQ== X-Received: by 10.205.44.134 with SMTP id ug6mr171674bkb.124.1395839147493; Wed, 26 Mar 2014 06:05:47 -0700 (PDT) Received: from david-tp.localdomain (stgt-5f7280a1.pool.mediaWays.net. [95.114.128.161]) by mx.google.com with ESMTPSA id xj2sm23082710bkb.15.2014.03.26.06.05.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Mar 2014 06:05:46 -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 Subject: [PATCH v5 4/4] brcmfmac: set NET_NAME_USER for P2P ifs Date: Wed, 26 Mar 2014 14:05:17 +0100 Message-Id: <1395839117-20090-5-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1395839117-20090-1-git-send-email-dh.herrmann@gmail.com> References: <1395839117-20090-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 --- 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) {