From patchwork Thu Feb 27 14:47:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 324833 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 1E5132C007E for ; Fri, 28 Feb 2014 01:47:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753162AbaB0Orq (ORCPT ); Thu, 27 Feb 2014 09:47:46 -0500 Received: from mail-ea0-f170.google.com ([209.85.215.170]:50812 "EHLO mail-ea0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396AbaB0Ore (ORCPT ); Thu, 27 Feb 2014 09:47:34 -0500 Received: by mail-ea0-f170.google.com with SMTP id g15so1916686eak.29 for ; Thu, 27 Feb 2014 06:47:31 -0800 (PST) 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=WF83eF7XY2DjRlJcxnYJiAeP1fS5qrKaY1c18+Ued9U=; b=sRxv0PPMhCuQST2Pr2fIh+voLtN0BuZvILld/6/Nc5QGLwF80Cbvl6oTrmnYMwAG/t sMiQYMWpfxf6HMbdhpZUFP/I6BYCFhCK57OfyJnanjuxLzJJJYZzxhhpbfNa423e7SSh 2vu1K7jeP/GAhzW9WHhmTT2g0m7s/1KRWg1SCVzDzNXZko46DrcDCv/WrUvnbK8Viq2r fc6brYxaUOfetcYrBi8n1mDmbIVWShZiNhJcVWkwQv4hOSjwxE/Md/SbhRWmSOnYhOlQ fW/COUCrXmo5qIWtNzuel3Iw1A8IKh0FGNH3C4+vsmtUCwQgg6PsFWScxwdFfrxhZIys vnNg== X-Received: by 10.15.48.1 with SMTP id g1mr13643537eew.51.1393512451389; Thu, 27 Feb 2014 06:47:31 -0800 (PST) Received: from david-tp.localdomain (stgt-5f72aa4f.pool.mediaWays.net. [95.114.170.79]) by mx.google.com with ESMTPSA id 43sm17691835eeh.13.2014.02.27.06.47.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Feb 2014 06:47:30 -0800 (PST) From: David Herrmann To: netdev@vger.kernel.org Cc: "David S. Miller" , Kay Sievers , Tom Gundersen , Johannes berg , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, David Herrmann , Arend van Spriel Subject: [PATCH 4/4] brcmfmac: set NET_NAME_USER for P2P ifs Date: Thu, 27 Feb 2014 15:47:14 +0100 Message-Id: <1393512434-1325-5-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393512434-1325-1-git-send-email-dh.herrmann@gmail.com> References: <1393512434-1325-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. Cc: Arend van Spriel Signed-off-by: David Herrmann --- 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 fc4f98b..6af4d26 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c @@ -2310,6 +2310,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) {