diff options
-rw-r--r-- | drivers/net/dl2k.c | 7 | ||||
-rw-r--r-- | drivers/net/dl2k.h | 12 |
2 files changed, 4 insertions, 15 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index 2e13eaad1708..e233d04a2132 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c | |||
@@ -1316,9 +1316,10 @@ rio_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) | |||
1316 | ("%02x:cur:%08x next:%08x status:%08x frag1:%08x frag0:%08x", | 1316 | ("%02x:cur:%08x next:%08x status:%08x frag1:%08x frag0:%08x", |
1317 | i, | 1317 | i, |
1318 | (u32) (np->tx_ring_dma + i * sizeof (*desc)), | 1318 | (u32) (np->tx_ring_dma + i * sizeof (*desc)), |
1319 | (u32) desc->next_desc, | 1319 | (u32)le64_to_cpu(desc->next_desc), |
1320 | (u32) desc->status, (u32) (desc->fraginfo >> 32), | 1320 | (u32)le64_to_cpu(desc->status), |
1321 | (u32) desc->fraginfo); | 1321 | (u32)(le64_to_cpu(desc->fraginfo) >> 32), |
1322 | (u32)le64_to_cpu(desc->fraginfo)); | ||
1322 | printk ("\n"); | 1323 | printk ("\n"); |
1323 | } | 1324 | } |
1324 | printk ("\n"); | 1325 | printk ("\n"); |
diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h index 5f00ecb4a280..d66c605b4075 100644 --- a/drivers/net/dl2k.h +++ b/drivers/net/dl2k.h | |||
@@ -364,18 +364,6 @@ enum _mii_anlpar { | |||
364 | }; | 364 | }; |
365 | 365 | ||
366 | /* Auto-Negotiation Expansion Register */ | 366 | /* Auto-Negotiation Expansion Register */ |
367 | typedef union t_MII_ANER { | ||
368 | u16 image; | ||
369 | struct { | ||
370 | u16 lp_negotiable:1; // bit 0 | ||
371 | u16 page_received:1; // bit 1 | ||
372 | u16 nextpagable:1; // bit 2 | ||
373 | u16 lp_nextpagable:1; // bit 3 | ||
374 | u16 pdetect_fault:1; // bit 4 | ||
375 | u16 _bit15_5:11; // bit 15:5 | ||
376 | } bits; | ||
377 | } ANER_t, *PANER_t; | ||
378 | |||
379 | enum _mii_aner { | 367 | enum _mii_aner { |
380 | MII_ANER_PAR_DETECT_FAULT = 0x0010, | 368 | MII_ANER_PAR_DETECT_FAULT = 0x0010, |
381 | MII_ANER_LP_NEXTPAGABLE = 0x0008, | 369 | MII_ANER_LP_NEXTPAGABLE = 0x0008, |