Skip to content

D
Dnsmasq
Commit f7fe3627 authored by Simon Kelley's avatar Simon Kelley
Browse files
Options

Tidy merge.

parent 36bec089
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
src/radv.c
View file @ f7fe3627
...@@ -485,7 +485,7 @@ time_t periodic_ra(time_t now) ...@@ -485,7 +485,7 @@ time_t periodic_ra(time_t now)
context->ra_time = 0; context->ra_time = 0;
else if (param.iface != 0 && else if (param.iface != 0 &&
indextoname(daemon->icmp6fd, param.iface, interface) && indextoname(daemon->icmp6fd, param.iface, interface) &&
iface_check(AF_LOCAL, NULL, interface)) iface_check(AF_LOCAL, NULL, interface, NULL))
{ {
struct iname *tmp; struct iname *tmp;
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next) for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment