diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2008-01-13 14:18:25 +0000 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-01-18 14:44:33 -0500 |
| commit | 0ca5f319f4bef00d31a21614345ecd5ea0ca8afd (patch) | |
| tree | 0879b13591e3d07d799ef8ba5239c441e3e6cf76 /drivers/net | |
| parent | 5b5119167b724f4c4d54e69f91f22a83b01207af (diff) | |
| download | linux-0ca5f319f4bef00d31a21614345ecd5ea0ca8afd.tar.gz | |
dl2k: the rest
remove an unused union-with-bitfield of the same sort, add missing conversions in debugging printk Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -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) ("%02x:cur:%08x next:%08x status:%08x frag1:%08x frag0:%08x", i, (u32) (np->tx_ring_dma + i * sizeof (*desc)), - (u32) desc->next_desc, - (u32) desc->status, (u32) (desc->fraginfo >> 32), - (u32) desc->fraginfo); + (u32)le64_to_cpu(desc->next_desc), + (u32)le64_to_cpu(desc->status), + (u32)(le64_to_cpu(desc->fraginfo) >> 32), + (u32)le64_to_cpu(desc->fraginfo)); printk ("\n"); } 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 { }; /* Auto-Negotiation Expansion Register */ -typedef union t_MII_ANER { - u16 image; - struct { - u16 lp_negotiable:1; // bit 0 - u16 page_received:1; // bit 1 - u16 nextpagable:1; // bit 2 - u16 lp_nextpagable:1; // bit 3 - u16 pdetect_fault:1; // bit 4 - u16 _bit15_5:11; // bit 15:5 - } bits; -} ANER_t, *PANER_t; - enum _mii_aner { MII_ANER_PAR_DETECT_FAULT = 0x0010, MII_ANER_LP_NEXTPAGABLE = 0x0008, |