diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h index b362d13c6c96..53945e07729a 100644 --- a/sys/dev/fxp/if_fxpvar.h +++ b/sys/dev/fxp/if_fxpvar.h @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxpvar.h,v 1.2 1997/09/21 22:02:09 gibbs Exp $ + * $Id: if_fxpvar.h,v 1.3 1997/09/29 11:27:43 davidg Exp $ */ /* @@ -50,19 +50,19 @@ struct fxp_softc { struct fxp_cb_tx *cbl_base; /* base of TxCB list */ struct fxp_cb_tx *cbl_first; /* first active TxCB in list */ struct fxp_cb_tx *cbl_last; /* last active TxCB in list */ + int tx_queued; /* # of active TxCB's */ + int need_mcsetup; /* multicast filter needs programming */ struct mbuf *rfa_headm; /* first mbuf in receive frame area */ struct mbuf *rfa_tailm; /* last mbuf in receive frame area */ struct fxp_stats *fxp_stats; /* Pointer to interface stats */ + int rx_idle_secs; /* # of seconds RX has been idle */ struct callout_handle stat_ch; /* Handle for canceling our stat timeout */ - int tx_queued; /* # of active TxCB's */ + struct fxp_cb_mcs *mcsp; /* Pointer to mcast setup descriptor */ + int all_mcasts; /* receive all multicasts */ int promisc_mode; /* promiscuous mode enabled */ int phy_primary_addr; /* address of primary PHY */ int phy_primary_device; /* device type of primary PHY */ int phy_10Mbps_only; /* PHY is 10Mbps-only device */ - int rx_idle_secs; /* # of seconds RX has been idle */ - int need_mcsetup; /* multicast filter needs programming */ - int all_mcasts; /* receive all multicasts */ - struct fxp_cb_mcs *mcsp; /* Pointer to mcast setup descriptor */ }; /* Macros to ease CSR access. */ diff --git a/sys/pci/if_fxpvar.h b/sys/pci/if_fxpvar.h index b362d13c6c96..53945e07729a 100644 --- a/sys/pci/if_fxpvar.h +++ b/sys/pci/if_fxpvar.h @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxpvar.h,v 1.2 1997/09/21 22:02:09 gibbs Exp $ + * $Id: if_fxpvar.h,v 1.3 1997/09/29 11:27:43 davidg Exp $ */ /* @@ -50,19 +50,19 @@ struct fxp_softc { struct fxp_cb_tx *cbl_base; /* base of TxCB list */ struct fxp_cb_tx *cbl_first; /* first active TxCB in list */ struct fxp_cb_tx *cbl_last; /* last active TxCB in list */ + int tx_queued; /* # of active TxCB's */ + int need_mcsetup; /* multicast filter needs programming */ struct mbuf *rfa_headm; /* first mbuf in receive frame area */ struct mbuf *rfa_tailm; /* last mbuf in receive frame area */ struct fxp_stats *fxp_stats; /* Pointer to interface stats */ + int rx_idle_secs; /* # of seconds RX has been idle */ struct callout_handle stat_ch; /* Handle for canceling our stat timeout */ - int tx_queued; /* # of active TxCB's */ + struct fxp_cb_mcs *mcsp; /* Pointer to mcast setup descriptor */ + int all_mcasts; /* receive all multicasts */ int promisc_mode; /* promiscuous mode enabled */ int phy_primary_addr; /* address of primary PHY */ int phy_primary_device; /* device type of primary PHY */ int phy_10Mbps_only; /* PHY is 10Mbps-only device */ - int rx_idle_secs; /* # of seconds RX has been idle */ - int need_mcsetup; /* multicast filter needs programming */ - int all_mcasts; /* receive all multicasts */ - struct fxp_cb_mcs *mcsp; /* Pointer to mcast setup descriptor */ }; /* Macros to ease CSR access. */