mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-10-25 12:14:38 +00:00
Tidy merge.
This commit is contained in:
1 parent
36bec089f7
commit
f7fe362721
1 file changed
+1
-1
+1
-1
@@ -485,7 +485,7 @@ time_t periodic_ra(time_t now)
|
||||
context->ra_time = 0;
|
||||
else if (param.iface != 0 &&
|
||||
indextoname(daemon->icmp6fd, param.iface, interface) &&
|
||||
iface_check(AF_LOCAL, NULL, interface))
|
||||
iface_check(AF_LOCAL, NULL, interface, NULL))
|
||||
{
|
||||
struct iname *tmp;
|
||||
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
||||
|
||||
Reference in new issue
Block a user