Autonegotiation fixes. NIC now autonegotiates to whatever the switch supports.

[people/pcmattman/gpxe.git] / src / drivers / net / e1000 / e1000_hw.h

diff --git a/src/drivers/net/e1000/e1000_hw.h b/src/drivers/net/e1000/e1000_hw.h
index 4287e7e..9e31939 100644 (file)
--- 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;
     uint8_t status;      /* Descriptor status */
     uint8_t errors;      /* Descriptor Errors */
     uint16_t special;

-} __attribute__ (( packed )) ;
+};

 
 /* Receive Descriptor - Extended */
 union e1000_rx_desc_extended {
 
 /* Receive Descriptor - Extended */
 union e1000_rx_desc_extended {


@@ -729,7 +729,7 @@ struct e1000_tx_desc {
             uint16_t special;
         } fields;
     } upper;
             uint16_t special;
         } fields;
     } upper;

-}  __attribute__ (( packed )) ;
+};

 
 /* Transmit Descriptor bit definitions */
 #define E1000_TXD_DTYP_D     0x00100000 /* Data Descriptor */
 
 /* 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 {
 
 /* 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;
        e1000_mac_type          mac_type;
        e1000_phy_type          phy_type;
        uint32_t                phy_init_script;