Revert back changes to made in rev 1.109 of if_em.c which were unnecessary.

This makes it easier for us to get the changes into -current and to -stable quickly.
This commit is contained in:
pdeuskar 2006-08-03 19:05:04 +00:00
parent 0daea30185
commit 260ac341af
2 changed files with 970 additions and 970 deletions

File diff suppressed because it is too large Load Diff

View File

@ -146,7 +146,7 @@ POSSIBILITY OF SUCH DAMAGE.
* This parameter controls when the driver calls the routine to reclaim
* transmit descriptors.
*/
#define EM_TX_CLEANUP_THRESHOLD (sc->num_tx_desc / 8)
#define EM_TX_CLEANUP_THRESHOLD (adapter->num_tx_desc / 8)
/*
* This parameter controls whether or not autonegotation is enabled.
@ -232,9 +232,9 @@ typedef enum _XSUM_CONTEXT_T {
OFFLOAD_UDP_IP
} XSUM_CONTEXT_T;
struct em_softc sc; /* XXX: ugly forward declaration */
struct adapter adapter; /* XXX: ugly forward declaration */
struct em_int_delay_info {
struct em_softc *sc; /* XXX: ugly pointer */
struct adapter *adapter; /* XXX: ugly pointer */
int offset; /* Register offset to read/write */
int value; /* Current value in usecs */
};
@ -253,7 +253,7 @@ struct em_dma_alloc {
};
/* Driver softc. */
struct em_softc {
struct adapter {
struct ifnet *ifp;
struct em_hw hw;