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>
This commit is contained in:
parent
5b5119167b
commit
0ca5f319f4
|
@ -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",
|
("%02x:cur:%08x next:%08x status:%08x frag1:%08x frag0:%08x",
|
||||||
i,
|
i,
|
||||||
(u32) (np->tx_ring_dma + i * sizeof (*desc)),
|
(u32) (np->tx_ring_dma + i * sizeof (*desc)),
|
||||||
(u32) desc->next_desc,
|
(u32)le64_to_cpu(desc->next_desc),
|
||||||
(u32) desc->status, (u32) (desc->fraginfo >> 32),
|
(u32)le64_to_cpu(desc->status),
|
||||||
(u32) desc->fraginfo);
|
(u32)(le64_to_cpu(desc->fraginfo) >> 32),
|
||||||
|
(u32)le64_to_cpu(desc->fraginfo));
|
||||||
printk ("\n");
|
printk ("\n");
|
||||||
}
|
}
|
||||||
printk ("\n");
|
printk ("\n");
|
||||||
|
|
|
@ -364,18 +364,6 @@ enum _mii_anlpar {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Auto-Negotiation Expansion Register */
|
/* 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 {
|
enum _mii_aner {
|
||||||
MII_ANER_PAR_DETECT_FAULT = 0x0010,
|
MII_ANER_PAR_DETECT_FAULT = 0x0010,
|
||||||
MII_ANER_LP_NEXTPAGABLE = 0x0008,
|
MII_ANER_LP_NEXTPAGABLE = 0x0008,
|
||||||
|
|
Loading…
Reference in New Issue