diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-12-15 01:44:33 +0000 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-12-17 16:02:28 -0500 |
| commit | 961994a0c2a24d9622eea7144b30ac773169659f (patch) | |
| tree | cdf1a7fc263bb1c9fc429f17d7353f7a34ef5fc3 /drivers/net/sis190.c | |
| parent | 87e417b2f3a061d5eb85906288738f4313f1d924 (diff) | |
| download | lwn-961994a0c2a24d9622eea7144b30ac773169659f.tar.gz lwn-961994a0c2a24d9622eea7144b30ac773169659f.zip | |
sis190 endianness
Check in sis190_rx_interrupt() is broken on big-endian
(desc->status is little-endian and everything else actually uses
it correctly, including other checks for OWNbit.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/sis190.c')
| -rw-r--r-- | drivers/net/sis190.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index 49f767bef6ae..7eab072ae792 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c @@ -474,7 +474,7 @@ static inline void sis190_map_to_asic(struct RxDesc *desc, dma_addr_t mapping, static inline void sis190_make_unusable_by_asic(struct RxDesc *desc) { desc->PSize = 0x0; - desc->addr = 0xdeadbeef; + desc->addr = cpu_to_le32(0xdeadbeef); desc->size &= cpu_to_le32(RingEnd); wmb(); desc->status = 0x0; @@ -580,7 +580,7 @@ static int sis190_rx_interrupt(struct net_device *dev, struct RxDesc *desc = tp->RxDescRing + entry; u32 status; - if (desc->status & OWNbit) + if (le32_to_cpu(desc->status) & OWNbit) break; status = le32_to_cpu(desc->PSize); @@ -1538,9 +1538,9 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev, /* Get MAC address from EEPROM */ for (i = 0; i < MAC_ADDR_LEN / 2; i++) { - __le16 w = sis190_read_eeprom(ioaddr, EEPROMMACAddr + i); + u16 w = sis190_read_eeprom(ioaddr, EEPROMMACAddr + i); - ((u16 *)dev->dev_addr)[i] = le16_to_cpu(w); + ((__le16 *)dev->dev_addr)[i] = cpu_to_le16(w); } sis190_set_rgmii(tp, sis190_read_eeprom(ioaddr, EEPROMInfo)); |