[master] Enhance support for vlans on freebsd.

diff --git a/RELNOTES b/RELNOTES
index ce66eec23b88ea396b1e175ea59221dc47fffd27..bc91c49050ed34f0ad3c3193b4686734937f1aff 100644 (file)
--- 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 fbceaa106db8645d475512025154ade13d011b86..a4269181298c25e6432d229d52b5c78962b4c874 100644 (file)
--- 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);