Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Aug 2018 02:59:56 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r337026 - head/sys/dev/bge
Message-ID:  <201808010259.w712xuHe031703@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Wed Aug  1 02:59:56 2018
New Revision: 337026
URL: https://svnweb.freebsd.org/changeset/base/337026

Log:
  As non-sparc64 undconditionally returns 1, simplify #ifdefs.
  
  MFC after:	1 week

Modified:
  head/sys/dev/bge/if_bge.c

Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c	Wed Aug  1 02:39:44 2018	(r337025)
+++ head/sys/dev/bge/if_bge.c	Wed Aug  1 02:59:56 2018	(r337026)
@@ -6724,15 +6724,15 @@ bge_sysctl_mem_read(SYSCTL_HANDLER_ARGS)
 static int
 bge_get_eaddr_fw(struct bge_softc *sc, uint8_t ether_addr[])
 {
-
+#ifdef __sparc64__
 	if (sc->bge_flags & BGE_FLAG_EADDR)
 		return (1);
 
-#ifdef __sparc64__
 	OF_getetheraddr(sc->bge_dev, ether_addr);
 	return (0);
-#endif
+#else
 	return (1);
+#endif
 }
 
 static int



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808010259.w712xuHe031703>