diff options
| author | Marty Connor | 2007-11-20 18:06:22 +0100 |
|---|---|---|
| committer | Marty Connor | 2007-11-20 18:06:22 +0100 |
| commit | 8973caa1e6e468f0750a88811af7382f1c3d9c1a (patch) | |
| tree | 2f6889051469ccb25e0af12a4545882c67281146 /src/drivers/net/e1000/e1000_hw.h | |
| parent | A version of the new e1000 driver that transmits. (diff) | |
| download | ipxe-8973caa1e6e468f0750a88811af7382f1c3d9c1a.tar.gz ipxe-8973caa1e6e468f0750a88811af7382f1c3d9c1a.tar.xz ipxe-8973caa1e6e468f0750a88811af7382f1c3d9c1a.zip | |
Autonegotiation fixes. NIC now autonegotiates to whatever the switch supports.
Diffstat (limited to 'src/drivers/net/e1000/e1000_hw.h')
| -rw-r--r-- | src/drivers/net/e1000/e1000_hw.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/net/e1000/e1000_hw.h b/src/drivers/net/e1000/e1000_hw.h index 4287e7e58..9e3193956 100644 --- a/src/drivers/net/e1000/e1000_hw.h +++ b/src/drivers/net/e1000/e1000_hw.h @@ -598,7 +598,7 @@ struct e1000_rx_desc { uint8_t status; /* Descriptor status */ uint8_t errors; /* Descriptor Errors */ uint16_t special; -} __attribute__ (( packed )) ; +}; /* Receive Descriptor - Extended */ union e1000_rx_desc_extended { @@ -729,7 +729,7 @@ struct e1000_tx_desc { uint16_t special; } fields; } upper; -} __attribute__ (( packed )) ; +}; /* Transmit Descriptor bit definitions */ #define E1000_TXD_DTYP_D 0x00100000 /* Data Descriptor */ @@ -1381,8 +1381,8 @@ struct e1000_hw_stats { /* Structure containing variables used by the shared code (e1000_hw.c) */ struct e1000_hw { - uint8_t *hw_addr; - uint8_t *flash_address; + uint8_t *hw_addr; + uint8_t *flash_address; e1000_mac_type mac_type; e1000_phy_type phy_type; uint32_t phy_init_script; |