From: Shawn Routhier <sar@isc.org>
Date: Mon, 19 May 2014 21:01:20 +0000 (-0700)
Subject: [master] Enhance support for vlans on freebsd.
X-Git-Tag: v4_3_1b1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59a351d6d50a80e76af0416089670aa0842b16dc;p=thirdparty%2Fdhcp.git

[master] Enhance support for vlans on freebsd.
---

diff --git a/RELNOTES b/RELNOTES
index ce66eec23..bc91c4905 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -156,6 +156,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.3.0rc1
 
 - None
diff --git a/common/bpf.c b/common/bpf.c
index fbceaa106..a42691812 100644
--- a/common/bpf.c
+++ b/common/bpf.c
@@ -578,6 +578,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);