diff options
| author | Roy Marples <roy@marples.name> | 2019-10-10 10:54:47 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2019-10-10 10:54:47 +0000 |
| commit | cc414bf33a0039a507f8a40528425c07808cab72 (patch) | |
| tree | 6124c4c9bda0d0903fea07cd0cdde1d82d40fa02 /src/if.c | |
| parent | 2f68fc40f01a26ee687a29bcae627850ec772095 (diff) | |
| download | dhcpcd-cc414bf33a0039a507f8a40528425c07808cab72.tar.xz | |
BSD: Add IFT_TUNNEL
Requires explicit support but shouldn't log a code.
Diffstat (limited to 'src/if.c')
| -rw-r--r-- | src/if.c | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -457,13 +457,13 @@ if_discover(struct dhcpcd_ctx *ctx, struct ifaddrs **ifaddrs, #ifdef IFT_BRIDGE case IFT_BRIDGE: /* FALLTHROUGH */ #endif -#ifdef IFT_PPP - case IFT_PPP: /* FALLTHROUGH */ -#endif #ifdef IFT_PROPVIRTUAL - case IFT_PROPVIRTUAL: + case IFT_PROPVIRTUAL: /* FALLTHROUGH */ +#endif +#ifdef IFT_TUNNEL + case IFT_TUNNEL: /* FALLTHROUGH */ #endif -#if defined(IFT_BRIDGE) || defined(IFT_PPP) || defined(IFT_PROPVIRTUAL) + case IFT_PPP: /* Don't allow unless explicit */ if ((argc == 0 || argc == -1) && ctx->ifac == 0 && active && @@ -475,15 +475,14 @@ if_discover(struct dhcpcd_ctx *ctx, struct ifaddrs **ifaddrs, ifp->name); active = IF_INACTIVE; } - __fallthrough; /* Appease gcc-7 */ /* FALLTHROUGH */ -#endif #ifdef IFT_L2VLAN case IFT_L2VLAN: /* FALLTHROUGH */ #endif #ifdef IFT_L3IPVLAN case IFT_L3IPVLAN: /* FALLTHROUGH */ #endif + /* FALLTHROUGH */ case IFT_ETHER: ifp->family = ARPHRD_ETHER; break; |