summaryrefslogtreecommitdiffstats
path: root/src/if.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2017-04-22 22:09:08 +0100
committerRoy Marples <roy@marples.name>2017-04-23 00:34:29 +0100
commit9049f85750ecb4ae9ab50ccae401a5e0e2a1a230 (patch)
tree3b94e98d07d8a25ac97ae8139a480832840956dc /src/if.c
parent9b04fabf77cdc6daff576c83d53c5833738d63d3 (diff)
downloaddhcpcd-9049f85750ecb4ae9ab50ccae401a5e0e2a1a230.tar.xz
Detect VLANID to use in IAID.
Summary: This only works if the VLAN interface has already been setup prior to starting dhcpcd. Initial fix for T115. Test Plan: Configure a vlan interface. Don't set any iaid in /etc/dhcpcd.conf. Start dhcpcd, check VLANID is used for IAID. Reviewers: sthen Reviewed By: sthen Tags: #dhcpcd Differential Revision: https://dev.marples.name/D107
Diffstat (limited to 'src/if.c')
-rw-r--r--src/if.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/if.c b/src/if.c
index 71385eef..bcf14f2d 100644
--- a/src/if.c
+++ b/src/if.c
@@ -516,6 +516,8 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
}
}
+ ifp->vlanid = if_vlanid(ifp);
+
#ifdef SIOCGIFPRIORITY
/* Respect the interface priority */
memset(&ifr, 0, sizeof(ifr));