diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2015-11-16 01:19:16 -0800 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2015-12-21 19:59:34 -0600 |
| commit | e97f7fbba5901ff4daa0e2e7f0cdbb5a98131d09 (patch) | |
| tree | 867e585b435a5a61a30481149a10b2bc5adbe52a /drivers/net/e1000.h | |
| parent | 92163873542207fda6953d5cd807b7e153ea32e6 (diff) | |
| download | u-boot-imx-e97f7fbba5901ff4daa0e2e7f0cdbb5a98131d09.zip u-boot-imx-e97f7fbba5901ff4daa0e2e7f0cdbb5a98131d09.tar.gz u-boot-imx-e97f7fbba5901ff4daa0e2e7f0cdbb5a98131d09.tar.bz2 | |
net: e1000: Remove dead codes wrapped by #if 0
Remove those dead codes wrapped by #if 0 and #endif.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'drivers/net/e1000.h')
| -rw-r--r-- | drivers/net/e1000.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index c851922..e46edcd 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -1093,11 +1093,6 @@ struct e1000_hw { e1000_media_type media_type; e1000_fc_type fc; e1000_bus_type bus_type; -#if 0 - e1000_bus_speed bus_speed; - e1000_bus_width bus_width; - uint32_t io_base; -#endif uint32_t asf_firmware_present; #ifndef CONFIG_E1000_NO_NVM uint32_t eeprom_semaphore_present; @@ -1116,29 +1111,11 @@ struct e1000_hw { uint32_t original_fc; uint32_t txcw; uint32_t autoneg_failed; -#if 0 - uint32_t max_frame_size; - uint32_t min_frame_size; - uint32_t mc_filter_type; - uint32_t num_mc_addrs; - uint32_t collision_delta; - uint32_t tx_packet_delta; - uint32_t ledctl_default; - uint32_t ledctl_mode1; - uint32_t ledctl_mode2; -#endif uint16_t autoneg_advertised; uint16_t pci_cmd_word; uint16_t fc_high_water; uint16_t fc_low_water; uint16_t fc_pause_time; -#if 0 - uint16_t current_ifs_val; - uint16_t ifs_min_val; - uint16_t ifs_max_val; - uint16_t ifs_step_size; - uint16_t ifs_ratio; -#endif uint16_t device_id; uint16_t vendor_id; uint16_t subsystem_id; @@ -1149,9 +1126,6 @@ struct e1000_hw { uint8_t forced_speed_duplex; uint8_t wait_autoneg_complete; uint8_t dma_fairness; -#if 0 - uint8_t perm_mac_addr[NODE_ADDRESS_SIZE]; -#endif bool disable_polarity_correction; bool speed_downgraded; bool get_link_status; @@ -1162,11 +1136,6 @@ struct e1000_hw { bool report_tx_early; bool phy_reset_disable; bool initialize_hw_bits_disable; -#if 0 - bool adaptive_ifs; - bool ifs_params_forced; - bool in_ifs_mode; -#endif e1000_smart_speed smart_speed; e1000_dsp_config dsp_config_state; }; |