[PATCH v7 23/33] net: openvswitch - set name assign type
From: Tom Gundersen <hidden>
Date: 2014-07-10 08:18:54
Also in:
lkml
Subsystem:
networking [general], openvswitch, the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Aaron Conole, Eelco Chaudron, Ilya Maximets, Linus Torvalds
Signed-off-by: Tom Gundersen <redacted> Cc: Pravin Shelar <redacted> Cc: dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.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;
--
1.9.3