From patchwork Mon Mar 17 19:42:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 3846141 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D6E109F369 for ; Mon, 17 Mar 2014 19:44:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 11CC020218 for ; Mon, 17 Mar 2014 19:44:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35228201F2 for ; Mon, 17 Mar 2014 19:44:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751506AbaCQTnN (ORCPT ); Mon, 17 Mar 2014 15:43:13 -0400 Received: from mail-bk0-f41.google.com ([209.85.214.41]:57096 "EHLO mail-bk0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751345AbaCQTnE (ORCPT ); Mon, 17 Mar 2014 15:43:04 -0400 Received: by mail-bk0-f41.google.com with SMTP id d7so438670bkh.0 for ; Mon, 17 Mar 2014 12:43:02 -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=dxbCgNz7GD0bIF84fbT145Z5ZfTannzvkcBAd2eJqdau+B/wJxPIbCNZyPDdM0yLsK nAVbrKSwvutS52qNo5YIG9GMTEM9SrOeciQXQx/Pb+VsT+nhp8Hkb1r0nCEY0E8XwJBa Vtp+bZfZpqqQqcnxowy9l5pFZKaXEKEBpBl5rkURRkHOKFu8PQiQXA89kOwKms10ZZei VIzIMwZaHZcn1hn+J+LG5zLh58Qzy2lJinUiuTRuGxESD9WreVrQMEl7PP+ttMTxkkWI fo6klDg6BjotrTbqlMQurfabXp3eBk5vwLmFTG62O/WqGZknEt6dFJmqe6gTfDNC+bn8 EGAQ== X-Received: by 10.205.36.133 with SMTP id ta5mr11744524bkb.28.1395085382691; Mon, 17 Mar 2014 12:43:02 -0700 (PDT) Received: from david-tp.localdomain (stgt-5f716d13.pool.mediaWays.net. [95.113.109.19]) by mx.google.com with ESMTPSA id z3sm14440745bkn.3.2014.03.17.12.43.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Mar 2014 12:43:01 -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 v4 4/4] brcmfmac: set NET_NAME_USER for P2P ifs Date: Mon, 17 Mar 2014 20:42:38 +0100 Message-Id: <1395085358-1171-5-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1395085358-1171-1-git-send-email-dh.herrmann@gmail.com> References: <1395085358-1171-1-git-send-email-dh.herrmann@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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) {