Merge pull request #3723 from slrz/zebra-rtadv-add-rfc8106-support

author David Lamparter <equinox@diac24.net>

Tue, 12 Feb 2019 13:30:00 +0000 (14:30 +0100)

committer GitHub <noreply@github.com>

Tue, 12 Feb 2019 13:30:00 +0000 (14:30 +0100)
author David Lamparter <equinox@diac24.net>
Tue, 12 Feb 2019 13:30:00 +0000 (14:30 +0100)
committer GitHub <noreply@github.com>
Tue, 12 Feb 2019 13:30:00 +0000 (14:30 +0100)
diff --cc zebra/interface.c
Simple merge
diff --cc zebra/rtadv.c
Simple merge
author	David Lamparter <equinox@diac24.net>
	Tue, 12 Feb 2019 13:30:00 +0000 (14:30 +0100)
committer	GitHub <noreply@github.com>
	Tue, 12 Feb 2019 13:30:00 +0000 (14:30 +0100)
		1	2
zebra/interface.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/rtadv.c	patch \|	diff1 \|	diff2 \|	blob \| history