diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/tulip/de2104x.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index 1b5edd646a8c..9281d06d5aaa 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c | |||
@@ -124,8 +124,6 @@ MODULE_PARM_DESC (rx_copybreak, "de2104x Breakpoint at which Rx packets are copi | |||
124 | /* Time in jiffies before concluding the transmitter is hung. */ | 124 | /* Time in jiffies before concluding the transmitter is hung. */ |
125 | #define TX_TIMEOUT (6*HZ) | 125 | #define TX_TIMEOUT (6*HZ) |
126 | 126 | ||
127 | #define DE_UNALIGNED_16(a) (u16)(get_unaligned((u16 *)(a))) | ||
128 | |||
129 | /* This is a mysterious value that can be written to CSR11 in the 21040 (only) | 127 | /* This is a mysterious value that can be written to CSR11 in the 21040 (only) |
130 | to support a pre-NWay full-duplex signaling mechanism using short frames. | 128 | to support a pre-NWay full-duplex signaling mechanism using short frames. |
131 | No one knows what it should be, but if left at its default value some | 129 | No one knows what it should be, but if left at its default value some |
@@ -1811,7 +1809,7 @@ static void __devinit de21041_get_srom_info (struct de_private *de) | |||
1811 | goto bad_srom; | 1809 | goto bad_srom; |
1812 | 1810 | ||
1813 | /* get default media type */ | 1811 | /* get default media type */ |
1814 | switch (DE_UNALIGNED_16(&il->default_media)) { | 1812 | switch (get_unaligned(&il->default_media)) { |
1815 | case 0x0001: de->media_type = DE_MEDIA_BNC; break; | 1813 | case 0x0001: de->media_type = DE_MEDIA_BNC; break; |
1816 | case 0x0002: de->media_type = DE_MEDIA_AUI; break; | 1814 | case 0x0002: de->media_type = DE_MEDIA_AUI; break; |
1817 | case 0x0204: de->media_type = DE_MEDIA_TP_FD; break; | 1815 | case 0x0204: de->media_type = DE_MEDIA_TP_FD; break; |
@@ -1875,9 +1873,9 @@ static void __devinit de21041_get_srom_info (struct de_private *de) | |||
1875 | bufp += sizeof (ib->opts); | 1873 | bufp += sizeof (ib->opts); |
1876 | 1874 | ||
1877 | if (ib->opts & MediaCustomCSRs) { | 1875 | if (ib->opts & MediaCustomCSRs) { |
1878 | de->media[idx].csr13 = DE_UNALIGNED_16(&ib->csr13); | 1876 | de->media[idx].csr13 = get_unaligned(&ib->csr13); |
1879 | de->media[idx].csr14 = DE_UNALIGNED_16(&ib->csr14); | 1877 | de->media[idx].csr14 = get_unaligned(&ib->csr14); |
1880 | de->media[idx].csr15 = DE_UNALIGNED_16(&ib->csr15); | 1878 | de->media[idx].csr15 = get_unaligned(&ib->csr15); |
1881 | bufp += sizeof(ib->csr13) + sizeof(ib->csr14) + | 1879 | bufp += sizeof(ib->csr13) + sizeof(ib->csr14) + |
1882 | sizeof(ib->csr15); | 1880 | sizeof(ib->csr15); |
1883 | 1881 | ||