misc drivers/net annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

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,
 
         addr_len = read_eeprom (ioaddr, 0, 8) == 0x8129 ? 8 : 6;
         for (i = 0; i < 3; i++)
-                ((u16 *) (dev->dev_addr))[i] =
-                    le16_to_cpu (read_eeprom (ioaddr, i + 7, addr_len));
+                ((__le16 *) (dev->dev_addr))[i] =
+                    cpu_to_le16(read_eeprom (ioaddr, i + 7, addr_len));
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
         /* The Rtl8139-specific entries in the device structure. */
@@ -1373,8 +1373,8 @@ static void rtl8139_hw_start (struct net_device *dev)
         /* unlock Config[01234] and BMCR register writes */
         RTL_W8_F (Cfg9346, Cfg9346_Unlock);
         /* Restore our idea of the MAC address. */
-        RTL_W32_F (MAC0 + 0, cpu_to_le32 (*(u32 *) (dev->dev_addr + 0)));
-        RTL_W32_F (MAC0 + 4, cpu_to_le32 (*(u32 *) (dev->dev_addr + 4)));
+        RTL_W32_F (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
+        RTL_W32_F (MAC0 + 4, le16_to_cpu (*(__le16 *) (dev->dev_addr + 4)));
 
         /* Must enable Tx/Rx before setting transfer thresholds! */
         RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb);
@@ -1945,7 +1945,7 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp,
                 rmb();
 
                 /* read size+status of next frame from DMA ring buffer */
-                rx_status = le32_to_cpu (*(u32 *) (rx_ring + ring_offset));
+                rx_status = le32_to_cpu (*(__le32 *) (rx_ring + ring_offset));
                 rx_size = rx_status >> 16;
                 pkt_size = rx_size - 4;