From patchwork Thu Feb 27 14:47:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 324835 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 CD04A2C007E for ; Fri, 28 Feb 2014 01:48:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752990AbaB0Orb (ORCPT ); Thu, 27 Feb 2014 09:47:31 -0500 Received: from mail-ea0-f182.google.com ([209.85.215.182]:38764 "EHLO mail-ea0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396AbaB0Or3 (ORCPT ); Thu, 27 Feb 2014 09:47:29 -0500 Received: by mail-ea0-f182.google.com with SMTP id b10so927189eae.41 for ; Thu, 27 Feb 2014 06:47:27 -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=sO5XOu2YDhYi9HnyMY0cX07y7QaGJPVnv4Aoi7BXsg4=; b=wThQ1zA7mvokAqVXmnvLhkKgdHb1vlGmG+mjFXllng51ZceDETl1Tg2+4C0KUklBs6 vXiXQ51NS0/dt3OTp4Yw6sVps11iZ8QeoNO45fDkjVo4ALbJPUXVrc4bWPPXQIgvy7qe QmOkIWwhCBIAPIlpA1Gc4zJnVGxtao/NfN1W2RXeyg1sBfW8bVif4dOIhwYqLW2FkQ5O sH0F3W3ptZfjgkf6vbehNGwfhsgW7OCKD3eoX+nPJ0cNVj7i3FSm9aTAV7pcwZfW39Er J7CFLOexHm3o9+n6aznDXAUn8IWCxBKwXxk/U99KcDVv6XnqGXgXZY/soYSoLO9+Pggl Jo2Q== X-Received: by 10.14.216.193 with SMTP id g41mr14176596eep.13.1393512447620; Thu, 27 Feb 2014 06:47:27 -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.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Feb 2014 06:47:26 -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 , Johannes Berg Subject: [PATCH 2/4] mac80211: set NET_NAME_USER for user-space created ifs Date: Thu, 27 Feb 2014 15:47:12 +0100 Message-Id: <1393512434-1325-3-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 The nl80211 interface allows creating new netdevs from user-space. The name is *always* provided by user-space, so we should set NET_NAME_USER to provide that information via sysfs. This allows udev to not rename dynamically created wifi devices (like wifi P2P devices). Cc: Johannes Berg Signed-off-by: David Herrmann --- net/mac80211/iface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index ce1c443..35561bd 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1620,6 +1620,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; + ndev->name_assign_type = NET_NAME_USER; ret = dev_alloc_name(ndev, ndev->name); if (ret < 0) { free_netdev(ndev);