From fc0fe76a279f1655aeefd27710f02458018af0ec Mon Sep 17 00:00:00 2001 From: phk Date: Sun, 22 Apr 2007 14:57:05 +0000 Subject: Don't rename fields with #define. Collapse two semantically identical structs. Add missing vr_ prefix. --- sys/pci/if_vrreg.h | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'sys/pci/if_vrreg.h') diff --git a/sys/pci/if_vrreg.h b/sys/pci/if_vrreg.h index 918de48..944b5cb 100644 --- a/sys/pci/if_vrreg.h +++ b/sys/pci/if_vrreg.h @@ -330,13 +330,10 @@ struct vr_desc { u_int32_t vr_status; u_int32_t vr_ctl; - u_int32_t vr_ptr1; - u_int32_t vr_ptr2; + u_int32_t vr_data; + u_int32_t vr_nextphys; }; -#define vr_data vr_ptr1 -#define vr_next vr_ptr2 - #define VR_RXSTAT_RXERR 0x00000001 #define VR_RXSTAT_CRCERR 0x00000002 @@ -415,17 +412,11 @@ struct vr_chain { struct vr_chain *vr_nextdesc; }; -struct vr_chain_onefrag { - struct vr_desc *vr_ptr; - struct mbuf *vr_mbuf; - struct vr_chain_onefrag *vr_nextdesc; -}; - struct vr_chain_data { - struct vr_chain_onefrag vr_rx_chain[VR_RX_LIST_CNT]; + struct vr_chain vr_rx_chain[VR_RX_LIST_CNT]; struct vr_chain vr_tx_chain[VR_TX_LIST_CNT]; - struct vr_chain_onefrag *vr_rx_head; + struct vr_chain *vr_rx_head; struct vr_chain *vr_tx_cons; struct vr_chain *vr_tx_prod; -- cgit v1.1