From mboxrd@z Thu Jan 1 00:00:00 1970 From: Auke Kok Subject: Re: [PATCH 05/23] e1000: rename flow control symbols Date: Tue, 19 Sep 2006 14:45:51 -0700 Message-ID: <4510650F.7050805@intel.com> References: <20060919172623.4605.56860.stgit@gitlost.site> <20060919172842.4605.41117.stgit@gitlost.site> <451040F6.1060902@pobox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, "Brandeburg, Jesse" , "Kok, Auke" , "Ronciak, John" Return-path: Received: from mga02.intel.com ([134.134.136.20]:55187 "EHLO mga02.intel.com") by vger.kernel.org with ESMTP id S1751217AbWISVrX (ORCPT ); Tue, 19 Sep 2006 17:47:23 -0400 To: Jeff Garzik In-Reply-To: <451040F6.1060902@pobox.com> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Jeff Garzik wrote: > Kok, Auke wrote: >> --- 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