From fd87fbf6b8be636a0ce8b74efbf1510ee42faea9 Mon Sep 17 00:00:00 2001
From: "Matthew N. Dodd" <mdodd@FreeBSD.org>
Date: Sat, 15 Mar 2003 19:10:19 +0000
Subject: [PATCH] - Remove definition of senderr() from iso88025.h. - Use
 definition of senderr() from if_ethersubr.c.

---
 sys/net/if_fddisubr.c     | 2 +-
 sys/net/if_iso88025subr.c | 3 ++-
 sys/net/iso88025.h        | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index da158ecec55..d1b8b227a52 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -99,7 +99,7 @@ static int fddi_output(struct ifnet *, struct mbuf *, struct sockaddr *,
 static void fddi_input(struct ifnet *ifp, struct mbuf *m);
 
 #define	IFP2AC(IFP)	((struct arpcom *)IFP)
-#define	senderr(e)	{ error = (e); goto bad; }
+#define	senderr(e)	do { error = (e); goto bad; } while (0)
 
 /*
  * FDDI output routine.
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 9f078456675..1bc11409d97 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -80,7 +80,8 @@
 static int iso88025_resolvemulti (struct ifnet *, struct sockaddr **,
 				  struct sockaddr *));
 
-#define IFP2AC(IFP) ((struct arpcom *)IFP)
+#define	IFP2AC(IFP)	((struct arpcom *)IFP)
+#define	senderr(e)	do { error = (e); goto bad; } while (0)
 
 void
 iso88025_ifattach(struct ifnet *ifp)
diff --git a/sys/net/iso88025.h b/sys/net/iso88025.h
index a8e6872ade8..71f22381294 100644
--- a/sys/net/iso88025.h
+++ b/sys/net/iso88025.h
@@ -130,7 +130,6 @@ struct	iso88025_addr {
 
 #define ISO88025_MAX_MTU	18000
 #define ISO88025_DEFAULT_MTU	1500
-#define senderr(e) { error = (e); goto bad;}
 
 void	iso88025_ifattach	(struct ifnet *);
 void	iso88025_ifdetach	(struct ifnet *, int);