Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e6db608 authored by Bryan Wu's avatar Bryan Wu Committed by Jeff Garzik
Browse files

smc91x: fix build breakage from the SMC_GET_MAC_ADDR API upgrade 



Cc: Jeff Garzik <jeff@garzik.org>
Cc: Deepak Saxena <dsaxena@plexity.net>
Cc: Nicolas Pitre <nico@cam.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent c7793ace

drivers/net/smc91x.h

+4 −4
Original line number Diff line number Diff line
@@ -92,14 +92,14 @@ 
#define SMC_insw(a, r, p, l) 	insw ((unsigned long *)((a) + (r)), p, l)

# endif

/* check if the mac in reg is valid */

#define SMC_GET_MAC_ADDR(addr)					\

#define SMC_GET_MAC_ADDR(lp, addr)				\

	do {							\

		unsigned int __v;				\

		__v = SMC_inw(ioaddr, ADDR0_REG);		\

		__v = SMC_inw(ioaddr, ADDR0_REG(lp));		\

		addr[0] = __v; addr[1] = __v >> 8;		\

		__v = SMC_inw(ioaddr, ADDR1_REG);		\

		__v = SMC_inw(ioaddr, ADDR1_REG(lp));		\

		addr[2] = __v; addr[3] = __v >> 8;		\

		__v = SMC_inw(ioaddr, ADDR2_REG);		\

		__v = SMC_inw(ioaddr, ADDR2_REG(lp));		\

		addr[4] = __v; addr[5] = __v >> 8;		\

		if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) {		\

			random_ether_addr(addr);		\