tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Revert "smc91x: fix build breakage from the SMC_GET_MAC_ADDR API upgrade"
This reverts commit 9e6db60825ef7e7999abc610ce256ba768e58162, which was
merged without the API it needed, causing build breakage.
Reported-by: Bryan Wu <cooloney@kernel.org>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+4
-4
+4
-4
drivers/net/smc91x.h
+4
-4
drivers/net/smc91x.h
···
92
92
#define SMC_insw(a, r, p, l) insw ((unsigned long *)((a) + (r)), p, l)
93
93
# endif
94
94
/* check if the mac in reg is valid */
95
-
#define SMC_GET_MAC_ADDR(lp, addr) \
95
+
#define SMC_GET_MAC_ADDR(addr) \
96
96
do { \
97
97
unsigned int __v; \
98
-
__v = SMC_inw(ioaddr, ADDR0_REG(lp)); \
98
+
__v = SMC_inw(ioaddr, ADDR0_REG); \
99
99
addr[0] = __v; addr[1] = __v >> 8; \
100
-
__v = SMC_inw(ioaddr, ADDR1_REG(lp)); \
100
+
__v = SMC_inw(ioaddr, ADDR1_REG); \
101
101
addr[2] = __v; addr[3] = __v >> 8; \
102
-
__v = SMC_inw(ioaddr, ADDR2_REG(lp)); \
102
+
__v = SMC_inw(ioaddr, ADDR2_REG); \
103
103
addr[4] = __v; addr[5] = __v >> 8; \
104
104
if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) { \
105
105
random_ether_addr(addr); \