diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2006-12-19 16:09:08 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-05 16:58:47 -0500 |
commit | bc63eb9c7ec0eb7b091db2d82d46d1e68ff9e231 (patch) | |
tree | dfcbc44d49a516eb2c95ac2f724fbee52427d0fd /drivers/net/macmace.c | |
parent | 079ca7da1e6d05c7cb82e9c4f2e1d98839332664 (diff) |
net: use bitrev8
Use bitrev8 for bmac, mace, macmace, macsonic, and skfp drivers.
[akpm@osdl.org: use the API, not the array]
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mirko Lindner <mlindner@syskonnect.de>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/macmace.c')
-rw-r--r-- | drivers/net/macmace.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c index 464e4a6f3d5f..5d541e873041 100644 --- a/drivers/net/macmace.c +++ b/drivers/net/macmace.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
24 | #include <linux/crc32.h> | 24 | #include <linux/crc32.h> |
25 | #include <linux/bitrev.h> | ||
25 | #include <asm/io.h> | 26 | #include <asm/io.h> |
26 | #include <asm/pgtable.h> | 27 | #include <asm/pgtable.h> |
27 | #include <asm/irq.h> | 28 | #include <asm/irq.h> |
@@ -81,19 +82,6 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id); | |||
81 | static irqreturn_t mace_dma_intr(int irq, void *dev_id); | 82 | static irqreturn_t mace_dma_intr(int irq, void *dev_id); |
82 | static void mace_tx_timeout(struct net_device *dev); | 83 | static void mace_tx_timeout(struct net_device *dev); |
83 | 84 | ||
84 | /* Bit-reverse one byte of an ethernet hardware address. */ | ||
85 | |||
86 | static int bitrev(int b) | ||
87 | { | ||
88 | int d = 0, i; | ||
89 | |||
90 | for (i = 0; i < 8; ++i, b >>= 1) { | ||
91 | d = (d << 1) | (b & 1); | ||
92 | } | ||
93 | |||
94 | return d; | ||
95 | } | ||
96 | |||
97 | /* | 85 | /* |
98 | * Load a receive DMA channel with a base address and ring length | 86 | * Load a receive DMA channel with a base address and ring length |
99 | */ | 87 | */ |
@@ -219,12 +207,12 @@ struct net_device *mace_probe(int unit) | |||
219 | addr = (void *)MACE_PROM; | 207 | addr = (void *)MACE_PROM; |
220 | 208 | ||
221 | for (j = 0; j < 6; ++j) { | 209 | for (j = 0; j < 6; ++j) { |
222 | u8 v=bitrev(addr[j<<4]); | 210 | u8 v = bitrev8(addr[j<<4]); |
223 | checksum ^= v; | 211 | checksum ^= v; |
224 | dev->dev_addr[j] = v; | 212 | dev->dev_addr[j] = v; |
225 | } | 213 | } |
226 | for (; j < 8; ++j) { | 214 | for (; j < 8; ++j) { |
227 | checksum ^= bitrev(addr[j<<4]); | 215 | checksum ^= bitrev8(addr[j<<4]); |
228 | } | 216 | } |
229 | 217 | ||
230 | if (checksum != 0xFF) { | 218 | if (checksum != 0xFF) { |