From patchwork Thu Jul 10 08:17:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 368513 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 CB0C41400A8 for ; Thu, 10 Jul 2014 18:23:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752275AbaGJISw (ORCPT ); Thu, 10 Jul 2014 04:18:52 -0400 Received: from mail-la0-f47.google.com ([209.85.215.47]:54196 "EHLO mail-la0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752219AbaGJISu (ORCPT ); Thu, 10 Jul 2014 04:18:50 -0400 Received: by mail-la0-f47.google.com with SMTP id s18so5746250lam.6 for ; Thu, 10 Jul 2014 01:18:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iChiSF7aL5ODLW4X7drmK3VFXoMqE2OWdCOE00BhbkI=; b=RePaGJOP+kzFO3Xnzt3YSInesovIKV5UoqqtYSRF7AnElg3FLb0zQStPs2hzPh2eys kH/QY1NhSS+lDf4otYzW7FT4RMxUB5tqi+gS4gnAFwiN8dNgvqf+yOhDK9sJDyODjeun ftu/WWe9LPtmrPSzm8SMuytMvaZc+7izqsfzLzSzsKxZDAMInA4d7jJR6/kUzHhgvI+Z aTbVO02EzgBWV4huRVhIYvcpjhXQVhv9abkGAetCNB3aEaWUcEPZyS0wFjhL1Ji5ScGT rYfGsE23tHH6m7N4eYDr5pH+oIx8fc531lZYYeHYSkPCd+awm4pt70ernRxKs9rWh8Q2 T94g== X-Gm-Message-State: ALoCoQm49U2sYV3OFi0duVFVxQQYo87ysQ84lO8HNuxqIR7975S+dyfmEtrb0KTdBU3SkfzGJJ9I X-Received: by 10.112.151.164 with SMTP id ur4mr2896343lbb.13.1404980329252; Thu, 10 Jul 2014 01:18:49 -0700 (PDT) Received: from localhost.localdomain (m188-149-105-114.cust.tele2.no. [188.149.105.114]) by mx.google.com with ESMTPSA id tg1sm37154793lbb.11.2014.07.10.01.18.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jul 2014 01:18:47 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Miller , David Herrmann , Kay Sievers , Tom Gundersen , Pravin Shelar , dev@openvswitch.org Subject: [PATCH v7 23/33] net: openvswitch - set name assign type Date: Thu, 10 Jul 2014 10:17:28 +0200 Message-Id: <1404980258-30853-24-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404980258-30853-1-git-send-email-teg@jklm.no> References: <1404980258-30853-1-git-send-email-teg@jklm.no> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Tom Gundersen Cc: Pravin Shelar Cc: dev@openvswitch.org --- net/openvswitch/datapath.c | 1 + net/openvswitch/vport-internal_dev.c | 2 +- net/openvswitch/vport.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 0d407bc..f216eca 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1370,6 +1370,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) /* Set up our datapath device. */ parms.name = nla_data(a[OVS_DP_ATTR_NAME]); + parms.name_assign_type = NET_NAME_USER; parms.type = OVS_VPORT_TYPE_INTERNAL; parms.options = NULL; parms.dp = dp; diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c index 0a5e077..ceb098c 100644 --- a/net/openvswitch/vport-internal_dev.c +++ b/net/openvswitch/vport-internal_dev.c @@ -159,7 +159,7 @@ static struct vport *internal_dev_create(const struct vport_parms *parms) netdev_vport = netdev_vport_priv(vport); netdev_vport->dev = alloc_netdev(sizeof(struct internal_dev), - parms->name, NET_NAME_UNKNOWN, + parms->name, parms->name_assign_type, do_setup); if (!netdev_vport->dev) { err = -ENOMEM; diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index 8d721e6..a9d7480 100644 --- a/net/openvswitch/vport.h +++ b/net/openvswitch/vport.h @@ -97,6 +97,7 @@ struct vport { * struct vport_parms - parameters for creating a new vport * * @name: New vport's name. + * @name_assign_type: New vport's name's origin. * @type: New vport's type. * @options: %OVS_VPORT_ATTR_OPTIONS attribute from Netlink message, %NULL if * none was supplied. @@ -105,6 +106,7 @@ struct vport { */ struct vport_parms { const char *name; + unsigned char name_assign_type; enum ovs_vport_type type; struct nlattr *options;