diff options
| author | Roy Marples <roy@marples.name> | 2019-08-20 13:34:27 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2019-08-20 13:34:27 +0100 |
| commit | 07a34ce62c5dd937d32ac003240ecafd963e6ad7 (patch) | |
| tree | a8f1eb457c4a774ff4470067832474cef1a2f6e5 /src/dhcpcd.c | |
| parent | 93c5fe76a35343c26232b0c71aaea24bf50a41db (diff) | |
| download | dhcpcd-07a34ce62c5dd937d32ac003240ecafd963e6ad7.tar.xz | |
DHCP: Allow DHCP over PtP interfaces.
This still requires manual configuration, but allows QMI devices to
work like so:
interface wwan0
dhcp
or on the command line:
dhcpcd --dhcp
Diffstat (limited to 'src/dhcpcd.c')
| -rw-r--r-- | src/dhcpcd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/dhcpcd.c b/src/dhcpcd.c index bddd316b..d2b8bd91 100644 --- a/src/dhcpcd.c +++ b/src/dhcpcd.c @@ -458,11 +458,10 @@ configure_interface1(struct interface *ifp) ifo->options &= ~DHCPCD_ARP; if (!(ifp->flags & IFF_MULTICAST)) ifo->options &= ~DHCPCD_IPV6RS; - if (!(ifo->options & DHCPCD_INFORM)) + if (!(ifo->options & (DHCPCD_INFORM | DHCPCD_WANTDHCP))) ifo->options |= DHCPCD_STATIC; } - if (ifp->flags & IFF_NOARP || - !(ifo->options & DHCPCD_ARP) || + if (!(ifo->options & DHCPCD_ARP) || ifo->options & (DHCPCD_INFORM | DHCPCD_STATIC)) ifo->options &= ~DHCPCD_IPV4LL; |