diff options
Diffstat (limited to 'drivers/net/tulip/uli526x.c')
-rw-r--r-- | drivers/net/tulip/uli526x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index a4fd782bcd2..53c7523960c 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
@@ -112,13 +112,13 @@ | |||
112 | 112 | ||
113 | /* Structure/enum declaration ------------------------------- */ | 113 | /* Structure/enum declaration ------------------------------- */ |
114 | struct tx_desc { | 114 | struct tx_desc { |
115 | u32 tdes0, tdes1, tdes2, tdes3; /* Data for the card */ | 115 | __le32 tdes0, tdes1, tdes2, tdes3; /* Data for the card */ |
116 | char *tx_buf_ptr; /* Data for us */ | 116 | char *tx_buf_ptr; /* Data for us */ |
117 | struct tx_desc *next_tx_desc; | 117 | struct tx_desc *next_tx_desc; |
118 | } __attribute__(( aligned(32) )); | 118 | } __attribute__(( aligned(32) )); |
119 | 119 | ||
120 | struct rx_desc { | 120 | struct rx_desc { |
121 | u32 rdes0, rdes1, rdes2, rdes3; /* Data for the card */ | 121 | __le32 rdes0, rdes1, rdes2, rdes3; /* Data for the card */ |
122 | struct sk_buff *rx_skb_ptr; /* Data for us */ | 122 | struct sk_buff *rx_skb_ptr; /* Data for us */ |
123 | struct rx_desc *next_rx_desc; | 123 | struct rx_desc *next_rx_desc; |
124 | } __attribute__(( aligned(32) )); | 124 | } __attribute__(( aligned(32) )); |
@@ -344,7 +344,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev, | |||
344 | 344 | ||
345 | /* read 64 word srom data */ | 345 | /* read 64 word srom data */ |
346 | for (i = 0; i < 64; i++) | 346 | for (i = 0; i < 64; i++) |
347 | ((u16 *) db->srom)[i] = cpu_to_le16(read_srom_word(db->ioaddr, i)); | 347 | ((__le16 *) db->srom)[i] = cpu_to_le16(read_srom_word(db->ioaddr, i)); |
348 | 348 | ||
349 | /* Set Node address */ | 349 | /* Set Node address */ |
350 | if(((u16 *) db->srom)[0] == 0xffff || ((u16 *) db->srom)[0] == 0) /* SROM absent, so read MAC address from ID Table */ | 350 | if(((u16 *) db->srom)[0] == 0xffff || ((u16 *) db->srom)[0] == 0) /* SROM absent, so read MAC address from ID Table */ |