aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-08-22 21:31:17 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:51 -0400
commit03233b90b0977d577322a6e1ddd56d9cc570d406 (patch)
tree028417573924ec769df9526ac719f54887b0d9ff
parenteeb70af91d3f38ba429d3c8e0519b3c1ff8a0955 (diff)
8139cp: trivial endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/8139cp.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index d437823c2c5e..abb2a3471087 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -303,25 +303,25 @@ static const unsigned int cp_rx_config =
303 (RX_DMA_BURST << RxCfgDMAShift); 303 (RX_DMA_BURST << RxCfgDMAShift);
304 304
305struct cp_desc { 305struct cp_desc {
306 u32 opts1; 306 __le32 opts1;
307 u32 opts2; 307 u32 opts2;
308 u64 addr; 308 __le64 addr;
309}; 309};
310 310
311struct cp_dma_stats { 311struct cp_dma_stats {
312 u64 tx_ok; 312 __le64 tx_ok;
313 u64 rx_ok; 313 __le64 rx_ok;
314 u64 tx_err; 314 __le64 tx_err;
315 u32 rx_err; 315 __le32 rx_err;
316 u16 rx_fifo; 316 __le16 rx_fifo;
317 u16 frame_align; 317 __le16 frame_align;
318 u32 tx_ok_1col; 318 __le32 tx_ok_1col;
319 u32 tx_ok_mcol; 319 __le32 tx_ok_mcol;
320 u64 rx_ok_phys; 320 __le64 rx_ok_phys;
321 u64 rx_ok_bcast; 321 __le64 rx_ok_bcast;
322 u32 rx_ok_mcast; 322 __le32 rx_ok_mcast;
323 u16 tx_abort; 323 __le16 tx_abort;
324 u16 tx_underrun; 324 __le16 tx_underrun;
325} __attribute__((packed)); 325} __attribute__((packed));
326 326
327struct cp_extra_stats { 327struct cp_extra_stats {
@@ -1018,8 +1018,8 @@ static void cp_init_hw (struct cp_private *cp)
1018 cpw8_f (Cfg9346, Cfg9346_Unlock); 1018 cpw8_f (Cfg9346, Cfg9346_Unlock);
1019 1019
1020 /* Restore our idea of the MAC address. */ 1020 /* Restore our idea of the MAC address. */
1021 cpw32_f (MAC0 + 0, cpu_to_le32 (*(u32 *) (dev->dev_addr + 0))); 1021 cpw32_f (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
1022 cpw32_f (MAC0 + 4, cpu_to_le32 (*(u32 *) (dev->dev_addr + 4))); 1022 cpw32_f (MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4)));
1023 1023
1024 cp_start_hw(cp); 1024 cp_start_hw(cp);
1025 cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */ 1025 cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */
@@ -1930,8 +1930,8 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1930 /* read MAC address from EEPROM */ 1930 /* read MAC address from EEPROM */
1931 addr_len = read_eeprom (regs, 0, 8) == 0x8129 ? 8 : 6; 1931 addr_len = read_eeprom (regs, 0, 8) == 0x8129 ? 8 : 6;
1932 for (i = 0; i < 3; i++) 1932 for (i = 0; i < 3; i++)
1933 ((u16 *) (dev->dev_addr))[i] = 1933 ((__le16 *) (dev->dev_addr))[i] =
1934 le16_to_cpu (read_eeprom (regs, i + 7, addr_len)); 1934 cpu_to_le16(read_eeprom (regs, i + 7, addr_len));
1935 memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 1935 memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
1936 1936
1937 dev->open = cp_open; 1937 dev->open = cp_open;