summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Routhier <sar@isc.org>2014-05-19 14:04:30 -0700
committerShawn Routhier <sar@isc.org>2014-05-19 14:04:30 -0700
commitb4326586f04ad2dd008f7485035d9c57af08b946 (patch)
tree43fab51b3211e3ab7b2ee96ba79fb3d65a46f6f8
parente43a8f47a0da322cbcbc5a0472d3b278f279edba (diff)
downloadisc-dhcp-b4326586f04ad2dd008f7485035d9c57af08b946.tar.gz
[v4_2] Enhance support for vlans on freebsd.
-rw-r--r--RELNOTES4
-rw-r--r--common/bpf.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/RELNOTES b/RELNOTES
index 7bc3c1f0..9b32b94c 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -124,6 +124,10 @@ by Eric Young (eay@cryptsoft.com).
client hibernates or otherwise shuts down.
[ISC-Bugs #35894]
+- Add a check for L2VLAN in bpf.c to help support VLAN interfaces
+ Thanks to Steinar Haug for the suggestion.
+ [ISC-Bugs #36033]
+
Changes since 4.2.6rc1
- None
diff --git a/common/bpf.c b/common/bpf.c
index d6d60131..21e870c3 100644
--- a/common/bpf.c
+++ b/common/bpf.c
@@ -575,6 +575,9 @@ get_hw_addr(const char *name, struct hardware *hw) {
*/
switch (sa->sdl_type) {
case IFT_ETHER:
+#if defined (IFT_L2VLAN)
+ case IFT_L2VLAN:
+#endif
hw->hlen = sa->sdl_alen + 1;
hw->hbuf[0] = HTYPE_ETHER;
memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);