summaryrefslogtreecommitdiff
path: root/sys/net/if_bridge.h
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2015-01-24 00:29:07 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2015-01-24 00:29:07 +0000
commit2fda989bf1d6710a0aaa1f603209734760d23bd5 (patch)
tree76a793084eba07e5a284d877f9353c56699ff895 /sys/net/if_bridge.h
parentd9613db2f474744f9c165b0b5a70906a4828cab9 (diff)
Userland (base & ports) was adapted to always include <netinet/in.h>
before <net/pfvar.h> or <net/if_pflog.h>. The kernel files can be cleaned up next. Some sockaddr_union steps make it into here as well. ok naddy
Diffstat (limited to 'sys/net/if_bridge.h')
-rw-r--r--sys/net/if_bridge.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_bridge.h b/sys/net/if_bridge.h
index eef94a78fc9..395efe789fc 100644
--- a/sys/net/if_bridge.h
+++ b/sys/net/if_bridge.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.h,v 1.40 2014/12/22 03:38:01 tedu Exp $ */
+/* $OpenBSD: if_bridge.h,v 1.41 2015/01/24 00:29:06 deraadt Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -407,7 +407,7 @@ struct bridge_rtnode {
u_int8_t brt_flags; /* address flags */
u_int8_t brt_age; /* age counter */
struct ether_addr brt_addr; /* dst addr */
- union sockaddr_union brt_tunnel; /* tunnel endpoint */
+ union pfsockaddr_union brt_tunnel; /* tunnel endpoint */
};
#ifndef BRIDGE_RTABLE_SIZE