From d0a2acd430c89bdf771aaa6c249cd31e7b021a7e Mon Sep 17 00:00:00 2001
From: Julian Elischer <julian@FreeBSD.org>
Date: Thu, 13 Oct 2005 21:48:27 +0000
Subject: [PATCH] Consolidate two adjacent conditional blocks I actually
 believe the code in question should be elsewhere (in the preceding function).

MFC after:	1 week
---
 sys/net/if_ethersubr.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 575d97c1301..578ea99e371 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -362,14 +362,10 @@ bad:			if (m != NULL)
 int
 ether_output_frame(struct ifnet *ifp, struct mbuf *m)
 {
+	int error;
 #if defined(INET) || defined(INET6)
 	struct ip_fw *rule = ip_dn_claim_rule(m);
-#else
-	void *rule = NULL;
-#endif
-	int error;
 
-#if defined(INET) || defined(INET6)
 	if (IPFW_LOADED && ether_ipfw != 0) {
 		if (ether_ipfw_chk(&m, ifp, &rule, 0) == 0) {
 			if (m) {