[PATCH v7 24/33] net: vlan - set name assign type
From: Tom Gundersen <hidden>
Date: 2014-07-10 08:23:29
Also in:
lkml
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
When deriving the name from the real device, inherit the assign type, otherwise set PREDICTABLE as the name will be uniquely determined by the VLANID. Signed-off-by: Tom Gundersen <redacted> Cc: Patrick McHardy <redacted> --- net/8021q/vlan.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index cba9c21..2fa26b6 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c@@ -215,6 +215,7 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id) struct net *net = dev_net(real_dev); struct vlan_net *vn = net_generic(net, vlan_net_id); char name[IFNAMSIZ]; + unsigned char name_assign_type; int err; if (vlan_id >= VLAN_VID_MASK)
@@ -229,18 +230,21 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id) case VLAN_NAME_TYPE_RAW_PLUS_VID: /* name will look like: eth1.0005 */ snprintf(name, IFNAMSIZ, "%s.%.4i", real_dev->name, vlan_id); + name_assign_type = real_dev->name_assign_type; break; case VLAN_NAME_TYPE_PLUS_VID_NO_PAD: /* Put our vlan.VID in the name. * Name will look like: vlan5 */ snprintf(name, IFNAMSIZ, "vlan%i", vlan_id); + name_assign_type = NET_NAME_PREDICTABLE; break; case VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD: /* Put our vlan.VID in the name. * Name will look like: eth0.5 */ snprintf(name, IFNAMSIZ, "%s.%i", real_dev->name, vlan_id); + name_assign_type = real_dev->name_assign_type; break; case VLAN_NAME_TYPE_PLUS_VID: /* Put our vlan.VID in the name.
@@ -248,10 +252,11 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id) */ default: snprintf(name, IFNAMSIZ, "vlan%.4i", vlan_id); + name_assign_type = NET_NAME_PREDICTABLE; } new_dev = alloc_netdev(sizeof(struct vlan_dev_priv), name, - NET_NAME_UNKNOWN, vlan_setup); + name_assign_type, vlan_setup); if (new_dev == NULL) return -ENOBUFS;
--
1.9.3