svn commit: r184710 - head/sys/net

Bjoern A. Zeeb bz at FreeBSD.org
Thu Nov 6 01:18:30 PST 2008


Author: bz
Date: Thu Nov  6 09:18:29 2008
New Revision: 184710
URL: http://svn.freebsd.org/changeset/base/184710

Log:
  Hide an unused variable in case we compile without INET.
  Include ethernet.h and if_arp.h directly so that the constants are
  always defined.
  Makes token compile without INET.
  
  MFC after:	2 months

Modified:
  head/sys/net/if_iso88025subr.c

Modified: head/sys/net/if_iso88025subr.c
==============================================================================
--- head/sys/net/if_iso88025subr.c	Thu Nov  6 09:07:56 2008	(r184709)
+++ head/sys/net/if_iso88025subr.c	Thu Nov  6 09:18:29 2008	(r184710)
@@ -55,10 +55,12 @@
 #include <sys/sockio.h> 
 
 #include <net/if.h>
+#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_llc.h>
 #include <net/if_types.h>
 
+#include <net/ethernet.h>
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/bpf.h>
@@ -695,7 +697,9 @@ iso88025_resolvemulti (ifp, llsa, sa)
 	struct sockaddr *sa;
 {
 	struct sockaddr_dl *sdl;
+#ifdef INET
 	struct sockaddr_in *sin;
+#endif
 #ifdef INET6
 	struct sockaddr_in6 *sin6;
 #endif


More information about the svn-src-head mailing list