Commit 0948812f authored by Yangbo Lu's avatar Yangbo Lu Committed by Benjamin Cabé
Browse files

net: vlan: drop current vlan interface naming 



There were two problems about vlan interface naming currently.

1. When there were more than 1 vlan interfaces. It's not able to
   initialze name for all of them to same name VLAN-<free>.
2. When enabled vlan with tag, the name VLAN-xxx was used.
   However we may need to support multiple physical interfaces
   in the future. So, it's not able to use same name VLAN-xxx
   either for same tag on different physical interfaces.

Signed-off-by: default avatarYangbo Lu <yangbo.lu@nxp.com>
parent 3fc03623

subsys/net/l2/ethernet/vlan.c

+3 −14
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ LOG_MODULE_REGISTER(net_ethernet_vlan, CONFIG_NET_L2_ETHERNET_LOG_LEVEL); 
 */

#if CONFIG_NET_VLAN_COUNT > 0



#define MAX_VLAN_NAME_LEN MIN(sizeof("VLAN-<#####>"), \

			      CONFIG_NET_INTERFACE_NAME_LEN)

#define MAX_VIRT_NAME_LEN MIN(sizeof("<not attached>"), \

			      CONFIG_NET_L2_VIRTUAL_MAX_NAME_LEN)
@@ -246,7 +244,7 @@ static bool enable_vlan_iface(struct vlan_context *ctx, 
			      struct net_if *iface)

{

	int iface_idx = net_if_get_by_iface(iface);

	char name[MAX(MAX_VLAN_NAME_LEN, MAX_VIRT_NAME_LEN)];

	char name[MAX_VIRT_NAME_LEN];

	int ret;



	if (iface_idx < 0) {
@@ -263,9 +261,6 @@ static bool enable_vlan_iface(struct vlan_context *ctx, 


	ctx->is_used = true;



	snprintk(name, sizeof(name), "VLAN-%d", ctx->tag);

	net_if_set_name(ctx->iface, name);



	snprintk(name, sizeof(name), "VLAN to %d",

		 net_if_get_by_iface(ctx->attached_to));

	net_virtual_set_name(ctx->iface, name);
@@ -277,7 +272,7 @@ static bool disable_vlan_iface(struct vlan_context *ctx, 
			       struct net_if *iface)

{

	int iface_idx = net_if_get_by_iface(iface);

	char name[MAX(MAX_VLAN_NAME_LEN, MAX_VIRT_NAME_LEN)];

	char name[MAX_VIRT_NAME_LEN];



	if (iface_idx < 0) {

		return false;
@@ -286,9 +281,6 @@ static bool disable_vlan_iface(struct vlan_context *ctx, 
	(void)net_virtual_interface_attach(iface, NULL);

	ctx->is_used = false;



	snprintk(name, sizeof(name), "VLAN-<free>");

	net_if_set_name(iface, name);



	snprintk(name, sizeof(name), "<not attached>");

	net_virtual_set_name(iface, name);
@@ -659,7 +651,7 @@ static int vlan_interface_attach(struct net_if *vlan_iface, 
static void vlan_iface_init(struct net_if *iface)

{

	struct vlan_context *ctx = net_if_get_device(iface)->data;

	char name[MAX(MAX_VLAN_NAME_LEN, MAX_VIRT_NAME_LEN)];

	char name[MAX_VIRT_NAME_LEN];



	if (ctx->init_done) {

		return;
@@ -668,9 +660,6 @@ static void vlan_iface_init(struct net_if *iface) 
	ctx->iface = iface;

	net_if_flag_set(iface, NET_IF_NO_AUTO_START);



	snprintk(name, sizeof(name), "VLAN-<free>");

	net_if_set_name(iface, name);



	snprintk(name, sizeof(name), "not attached");

	net_virtual_set_name(iface, name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE