summaryrefslogtreecommitdiffstats
path: root/if.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2015-03-05 19:43:46 +0000
committerRoy Marples <roy@marples.name>2015-03-05 19:43:46 +0000
commit42bade9fadde446d82c27028837f21b078a794e8 (patch)
tree114cf5f295519e432ba7662e7199d1b775057a5b /if.c
parent850b8d47715db512a5c5784172765b5e70f8455f (diff)
downloaddhcpcd-42bade9fadde446d82c27028837f21b078a794e8.tar.xz
Add support for IFT_PPP and IFT_PROPVIRTUAL.
Thanks to Guy Yur.
Diffstat (limited to 'if.c')
-rw-r--r--if.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/if.c b/if.c
index 7d1126cf..3eb85796 100644
--- a/if.c
+++ b/if.c
@@ -331,8 +331,16 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
ifp->index = sdl->sdl_index;
switch(sdl->sdl_type) {
#ifdef IFT_BRIDGE
- case IFT_BRIDGE:
- /* Don't allow bridge unless explicit */
+ case IFT_BRIDGE: /* FALLTHROUGH */
+#endif
+#ifdef IFT_PPP
+ case IFT_PPP: /* FALLTHROUGH */
+#endif
+#ifdef IFT_PROPVIRTUAL
+ case IFT_PROPVIRTUAL: /* FALLTHROUGH */
+#endif
+#if defined(IFT_BRIDGE) || defined(IFT_PPP) || defined(IFT_PROPVIRTUAL)
+ /* Don't allow unless explicit */
if ((argc == 0 || argc == -1) &&
ctx->ifac == 0 &&
!if_hasconf(ctx, ifp->name))
@@ -340,10 +348,10 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
if_free(ifp);
continue;
}
- /* FALLTHOUGH */
+ /* FALLTHROUGH */
#endif
#ifdef IFT_L2VLAN
- case IFT_L2VLAN: /* FALLTHOUGH */
+ case IFT_L2VLAN: /* FALLTHROUGH */
#endif
#ifdef IFT_L3IPVLAN
case IFT_L3IPVLAN: /* FALLTHROUGH */