projects
/
project
/
odhcpd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
93a6018
)
Merge branch 'master' of github.com:sbyx/odhcpd
author
Steven Barth
<steven@midlink.org>
Tue, 10 Dec 2013 14:56:41 +0000
(15:56 +0100)
committer
Steven Barth
<steven@midlink.org>
Tue, 10 Dec 2013 14:56:41 +0000
(15:56 +0100)
src/router.c
patch
|
blob
|
history
diff --git
a/src/router.c
b/src/router.c
index a213c84739778e43db0dd670937ff49cc5d17189..86726be6f1033f8da784e25f34858065baa824f3 100644
(file)
--- a/
src/router.c
+++ b/
src/router.c
@@
-273,7
+273,10
@@
static void send_router_advert(struct uloop_timeout *event)
.lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}},
.mtu = {ND_OPT_MTU, 1, 0, htonl(mtu)},
};
- adv.h.nd_ra_flags_reserved = ND_RA_FLAG_OTHER;
+
+ if (iface->dhcpv6)
+ adv.h.nd_ra_flags_reserved = ND_RA_FLAG_OTHER;
+
if (iface->managed >= RELAYD_MANAGED_MFLAG)
adv.h.nd_ra_flags_reserved |= ND_RA_FLAG_MANAGED;