Jeff Garzik wrote:

Kok, Auke wrote:

quoted

--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h

@@ -90,15 +90,6 @@ typedef enum {
     e1000_100_full = 3
 } e1000_speed_duplex_type;
 
-/* Flow Control Settings */
-typedef enum {
-    e1000_fc_none = 0,
-    e1000_fc_rx_pause = 1,
-    e1000_fc_tx_pause = 2,
-    e1000_fc_full = 3,
-    e1000_fc_default = 0xFF
-} e1000_fc_type;
-
 struct e1000_shadow_ram {
     uint16_t    eeprom_word;
     boolean_t   modified;

@@ -1376,7 +1367,7 @@ struct e1000_hw {
     struct e1000_shadow_ram *eeprom_shadow_ram;
     uint32_t flash_bank_size;
     uint32_t flash_base_addr;
-    e1000_fc_type fc;
+    uint32_t fc;
     e1000_bus_speed bus_speed;
     e1000_bus_width bus_width;
     e1000_bus_type bus_type;

@@ -1930,6 +1921,13 @@ struct e1000_hw {
 #define E1000_FCRTL_RTL  0x0000FFF8     /* Mask Bits[15:3] for RTL */
 #define E1000_FCRTL_XONE 0x80000000     /* Enable XON frame 

transmission */
 
+/* Flow Control Settings */
+#define E1000_FC_NONE     0
+#define E1000_FC_RX_PAUSE 1
+#define E1000_FC_TX_PAUSE 2
+#define E1000_FC_FULL     3
+#define E1000_FC_DEFAULT  0xFF

NAK.  Goes from enum to #define, which loses type information and 
obfuscates things when inside a debugger (or other tool knowledgable of 
source code symbols).

Agreed, will change this back into an enum.

Auke