Skip to content

device: skip VLAN chain lookup for existing kernel interfaces #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghoker143 wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −2
Open

device: skip VLAN chain lookup for existing kernel interfaces #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <net/if.h>
#include <assert.h>

#include <sys/types.h>
Expand Down Expand Up @@ -893,8 +894,16 @@ __device_get(const char *name, int create, bool check_vlan)

dev = avl_find_element(&devices, name, dev, avl);

if (!dev && check_vlan && strchr(name, '.'))
return get_vlan_device_chain(name, create);
if (!dev && check_vlan && strchr(name, '.')) {
/*
* Only treat dotted names as VLAN-style if the full name does
* NOT already exist as a real kernel netdev. Externally managed
* interfaces (e.g. ModemManager QMI mux links: qmapmux0.0) are
* valid kernel devices whose names happen to contain a dot.
*/
if (!if_nametoindex(name))
return get_vlan_device_chain(name, create);
}

if (name[0] == '@')
return device_alias_get(name + 1);
Expand Down