diff options
author | Auke Kok <auke\-jan.h.kok@intel.com> | 2006-11-01 11:47:30 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-12-02 00:11:58 -0500 |
commit | 90fb51358a264f2f7e0cabdca6fc229bbc40cd91 (patch) | |
tree | d473bdee8cc4588eb610c596e14effd329e86fe4 /drivers/net/e1000/e1000_hw.h | |
parent | a362bf57aa12835e4fa6af6960e5135b5626bc5b (diff) |
e1000: whitespace changes, comments, typos
Small whitespace changes, comment changes, typo fixes.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000_hw.h')
-rw-r--r-- | drivers/net/e1000/e1000_hw.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index 449a60303e07..b32a0c3cfd10 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h | |||
@@ -326,6 +326,7 @@ int32_t e1000_phy_hw_reset(struct e1000_hw *hw); | |||
326 | int32_t e1000_phy_reset(struct e1000_hw *hw); | 326 | int32_t e1000_phy_reset(struct e1000_hw *hw); |
327 | int32_t e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info); | 327 | int32_t e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info); |
328 | int32_t e1000_validate_mdi_setting(struct e1000_hw *hw); | 328 | int32_t e1000_validate_mdi_setting(struct e1000_hw *hw); |
329 | |||
329 | void e1000_phy_powerdown_workaround(struct e1000_hw *hw); | 330 | void e1000_phy_powerdown_workaround(struct e1000_hw *hw); |
330 | 331 | ||
331 | /* EEPROM Functions */ | 332 | /* EEPROM Functions */ |
@@ -390,7 +391,6 @@ int32_t e1000_mng_write_dhcp_info(struct e1000_hw *hw, uint8_t *buffer, | |||
390 | uint16_t length); | 391 | uint16_t length); |
391 | boolean_t e1000_check_mng_mode(struct e1000_hw *hw); | 392 | boolean_t e1000_check_mng_mode(struct e1000_hw *hw); |
392 | boolean_t e1000_enable_tx_pkt_filtering(struct e1000_hw *hw); | 393 | boolean_t e1000_enable_tx_pkt_filtering(struct e1000_hw *hw); |
393 | |||
394 | int32_t e1000_read_eeprom(struct e1000_hw *hw, uint16_t reg, uint16_t words, uint16_t *data); | 394 | int32_t e1000_read_eeprom(struct e1000_hw *hw, uint16_t reg, uint16_t words, uint16_t *data); |
395 | int32_t e1000_validate_eeprom_checksum(struct e1000_hw *hw); | 395 | int32_t e1000_validate_eeprom_checksum(struct e1000_hw *hw); |
396 | int32_t e1000_update_eeprom_checksum(struct e1000_hw *hw); | 396 | int32_t e1000_update_eeprom_checksum(struct e1000_hw *hw); |
@@ -576,6 +576,7 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw); | |||
576 | * E1000_RAR_ENTRIES - 1 multicast addresses. | 576 | * E1000_RAR_ENTRIES - 1 multicast addresses. |
577 | */ | 577 | */ |
578 | #define E1000_RAR_ENTRIES 15 | 578 | #define E1000_RAR_ENTRIES 15 |
579 | |||
579 | #define E1000_RAR_ENTRIES_ICH8LAN 6 | 580 | #define E1000_RAR_ENTRIES_ICH8LAN 6 |
580 | 581 | ||
581 | #define MIN_NUMBER_OF_DESCRIPTORS 8 | 582 | #define MIN_NUMBER_OF_DESCRIPTORS 8 |
@@ -1335,9 +1336,9 @@ struct e1000_hw_stats { | |||
1335 | uint64_t gotch; | 1336 | uint64_t gotch; |
1336 | uint64_t rnbc; | 1337 | uint64_t rnbc; |
1337 | uint64_t ruc; | 1338 | uint64_t ruc; |
1339 | uint64_t rfc; | ||
1338 | uint64_t roc; | 1340 | uint64_t roc; |
1339 | uint64_t rlerrc; | 1341 | uint64_t rlerrc; |
1340 | uint64_t rfc; | ||
1341 | uint64_t rjc; | 1342 | uint64_t rjc; |
1342 | uint64_t mgprc; | 1343 | uint64_t mgprc; |
1343 | uint64_t mgpdc; | 1344 | uint64_t mgpdc; |