From patchwork Sun Mar 16 17:21:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 330722 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 3D3DF2C00A1 for ; Mon, 17 Mar 2014 04:24:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755466AbaCPRWu (ORCPT ); Sun, 16 Mar 2014 13:22:50 -0400 Received: from mail-bk0-f43.google.com ([209.85.214.43]:56147 "EHLO mail-bk0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754676AbaCPRV6 (ORCPT ); Sun, 16 Mar 2014 13:21:58 -0400 Received: by mail-bk0-f43.google.com with SMTP id v15so321521bkz.16 for ; Sun, 16 Mar 2014 10:21:57 -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=N2HkXRAIMBhWnIcxDLdc61vxYtPZoakZZdQJ0Ks8pk4=; b=Eyjhkv00Y9b35v6z6XzYFrb+pJmRocH0HkWfNNNHrOuol425cH90voXi2IcCimKR4d Mp86Dlodi2U31uFwqUcOC/wP1xzlUuRnFGDVCq7b7eBegqveVkSIIW+3RjT6XGsL+PWi cXg1FER8R2lrEATOtcCvkjuJMFOCzXqpi49t/YxhTl+OlA0NqFNYF9SMS0gS3dyLzmFU FzQLik4LmWw2IGpmabCr1HYsbehOtJ9e+Srw4SPBItAM7B6ji6TbcG9A7Y0Vk/zpEA6D k8h6f/ljxWIYrK2SLhLTx2M6a4xH42NOsmuc3Siig8+eeBYnR+Sqzkn50RHuSJV/tarQ sXcA== X-Received: by 10.205.9.67 with SMTP id ov3mr10236515bkb.13.1394990517026; Sun, 16 Mar 2014 10:21:57 -0700 (PDT) Received: from david-tp.localdomain (stgt-5f71837b.pool.mediaWays.net. [95.113.131.123]) by mx.google.com with ESMTPSA id ci7sm11314777bkc.0.2014.03.16.10.21.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 16 Mar 2014 10:21:56 -0700 (PDT) From: David Herrmann To: netdev@vger.kernel.org Cc: "David S. Miller" , Tom Gundersen , Johannes berg , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, David Herrmann Subject: [PATCH v2 4/4] brcmfmac: set NET_NAME_USER for P2P ifs Date: Sun, 16 Mar 2014 18:21:30 +0100 Message-Id: <1394990490-1076-5-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1394990490-1076-1-git-send-email-dh.herrmann@gmail.com> References: <1394990490-1076-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 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) {