diff options
| author | Roland Dreier <rdreier@cisco.com> | 2010-06-02 06:36:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-03 06:28:24 -0400 |
| commit | 9e2d11b926765681f72db0373d2ecbbac28359b3 (patch) | |
| tree | 73f22ef1fe41bb827d2cc77fae033aa7c20781a8 /drivers | |
| parent | d23380701876dd93d310b2548c51d0f78f25d7aa (diff) | |
epic100: Test __BIG_ENDIAN instead of (non-existent) CONFIG_BIG_ENDIAN
Probably no one has used this driver on big-endian systems, since it was
setting up descriptor swapping if CONFIG_BIG_ENDIAN is set, which it
never is, since that symbol is not mentioned anywhere else in the kernel
source. Switch this test to a check for __BIG_ENDIAN so it has a chance
at working.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/epic100.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 6838dfc9ef23..4c274657283c 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
| @@ -87,6 +87,7 @@ static int rx_copybreak; | |||
| 87 | #include <linux/bitops.h> | 87 | #include <linux/bitops.h> |
| 88 | #include <asm/io.h> | 88 | #include <asm/io.h> |
| 89 | #include <asm/uaccess.h> | 89 | #include <asm/uaccess.h> |
| 90 | #include <asm/byteorder.h> | ||
| 90 | 91 | ||
| 91 | /* These identify the driver base version and may not be removed. */ | 92 | /* These identify the driver base version and may not be removed. */ |
| 92 | static char version[] __devinitdata = | 93 | static char version[] __devinitdata = |
| @@ -230,7 +231,7 @@ static const u16 media2miictl[16] = { | |||
| 230 | * The EPIC100 Rx and Tx buffer descriptors. Note that these | 231 | * The EPIC100 Rx and Tx buffer descriptors. Note that these |
| 231 | * really ARE host-endian; it's not a misannotation. We tell | 232 | * really ARE host-endian; it's not a misannotation. We tell |
| 232 | * the card to byteswap them internally on big-endian hosts - | 233 | * the card to byteswap them internally on big-endian hosts - |
| 233 | * look for #ifdef CONFIG_BIG_ENDIAN in epic_open(). | 234 | * look for #ifdef __BIG_ENDIAN in epic_open(). |
| 234 | */ | 235 | */ |
| 235 | 236 | ||
| 236 | struct epic_tx_desc { | 237 | struct epic_tx_desc { |
| @@ -690,7 +691,7 @@ static int epic_open(struct net_device *dev) | |||
| 690 | outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL); | 691 | outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL); |
| 691 | 692 | ||
| 692 | /* Tell the chip to byteswap descriptors on big-endian hosts */ | 693 | /* Tell the chip to byteswap descriptors on big-endian hosts */ |
| 693 | #ifdef CONFIG_BIG_ENDIAN | 694 | #ifdef __BIG_ENDIAN |
| 694 | outl(0x4432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL); | 695 | outl(0x4432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL); |
| 695 | inl(ioaddr + GENCTL); | 696 | inl(ioaddr + GENCTL); |
| 696 | outl(0x0432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL); | 697 | outl(0x0432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL); |
| @@ -806,7 +807,7 @@ static void epic_restart(struct net_device *dev) | |||
| 806 | for (i = 16; i > 0; i--) | 807 | for (i = 16; i > 0; i--) |
| 807 | outl(0x0008, ioaddr + TEST1); | 808 | outl(0x0008, ioaddr + TEST1); |
| 808 | 809 | ||
| 809 | #ifdef CONFIG_BIG_ENDIAN | 810 | #ifdef __BIG_ENDIAN |
| 810 | outl(0x0432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL); | 811 | outl(0x0432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL); |
| 811 | #else | 812 | #else |
| 812 | outl(0x0412 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL); | 813 | outl(0x0412 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL); |
