From: mpi <mpi@openbsd.org>
Date: Tue, 12 May 2015 12:35:10 +0000 (+0000)
Subject: This file is only compiled when "pseudo-device bridge" is included in
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=fb760b7138a2c55151b3a5403b3a2b49efeef29d;p=openbsd

This file is only compiled when "pseudo-device bridge" is included in
your kernel configuration, no need for a #if NBRIDGE > 0 dance.
---

diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 3e714544d8b..e4b09da504a 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bridgestp.c,v 1.53 2015/05/04 10:24:08 mpi Exp $	*/
+/*	$OpenBSD: bridgestp.c,v 1.54 2015/05/12 12:35:10 mpi Exp $	*/
 
 /*
  * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -32,10 +32,6 @@
  * ISO/IEC 802.1D-2004, June 9, 2004.
  */
 
-#include "bridge.h"
-
-#if NBRIDGE > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -2280,4 +2276,3 @@ bstp_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 
 	return (err);
 }
-#endif /* NBRIDGE */