diff options
Diffstat (limited to 'drivers/net/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index be6e918456d9..53bd903d2321 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -966,8 +966,8 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, | |||
966 | 966 | ||
967 | addr_len = read_eeprom (ioaddr, 0, 8) == 0x8129 ? 8 : 6; | 967 | addr_len = read_eeprom (ioaddr, 0, 8) == 0x8129 ? 8 : 6; |
968 | for (i = 0; i < 3; i++) | 968 | for (i = 0; i < 3; i++) |
969 | ((u16 *) (dev->dev_addr))[i] = | 969 | ((__le16 *) (dev->dev_addr))[i] = |
970 | le16_to_cpu (read_eeprom (ioaddr, i + 7, addr_len)); | 970 | cpu_to_le16(read_eeprom (ioaddr, i + 7, addr_len)); |
971 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | 971 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); |
972 | 972 | ||
973 | /* The Rtl8139-specific entries in the device structure. */ | 973 | /* The Rtl8139-specific entries in the device structure. */ |
@@ -1373,8 +1373,8 @@ static void rtl8139_hw_start (struct net_device *dev) | |||
1373 | /* unlock Config[01234] and BMCR register writes */ | 1373 | /* unlock Config[01234] and BMCR register writes */ |
1374 | RTL_W8_F (Cfg9346, Cfg9346_Unlock); | 1374 | RTL_W8_F (Cfg9346, Cfg9346_Unlock); |
1375 | /* Restore our idea of the MAC address. */ | 1375 | /* Restore our idea of the MAC address. */ |
1376 | RTL_W32_F (MAC0 + 0, cpu_to_le32 (*(u32 *) (dev->dev_addr + 0))); | 1376 | RTL_W32_F (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0))); |
1377 | RTL_W32_F (MAC0 + 4, cpu_to_le32 (*(u32 *) (dev->dev_addr + 4))); | 1377 | RTL_W32_F (MAC0 + 4, le16_to_cpu (*(__le16 *) (dev->dev_addr + 4))); |
1378 | 1378 | ||
1379 | /* Must enable Tx/Rx before setting transfer thresholds! */ | 1379 | /* Must enable Tx/Rx before setting transfer thresholds! */ |
1380 | RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb); | 1380 | RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb); |
@@ -1945,7 +1945,7 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp, | |||
1945 | rmb(); | 1945 | rmb(); |
1946 | 1946 | ||
1947 | /* read size+status of next frame from DMA ring buffer */ | 1947 | /* read size+status of next frame from DMA ring buffer */ |
1948 | rx_status = le32_to_cpu (*(u32 *) (rx_ring + ring_offset)); | 1948 | rx_status = le32_to_cpu (*(__le32 *) (rx_ring + ring_offset)); |
1949 | rx_size = rx_status >> 16; | 1949 | rx_size = rx_status >> 16; |
1950 | pkt_size = rx_size - 4; | 1950 | pkt_size = rx_size - 4; |
1951 | 1951 | ||