diff options
Diffstat (limited to 'drivers/net/e1000e/lib.c')
-rw-r--r-- | drivers/net/e1000e/lib.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index 341d74e81fb0..95f75a43c9f9 100644 --- a/drivers/net/e1000e/lib.c +++ b/drivers/net/e1000e/lib.c | |||
@@ -1140,7 +1140,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw) | |||
1140 | } | 1140 | } |
1141 | 1141 | ||
1142 | /** | 1142 | /** |
1143 | * e1000e_get_speed_and_duplex_copper - Retreive current speed/duplex | 1143 | * e1000e_get_speed_and_duplex_copper - Retrieve current speed/duplex |
1144 | * @hw: pointer to the HW structure | 1144 | * @hw: pointer to the HW structure |
1145 | * @speed: stores the current speed | 1145 | * @speed: stores the current speed |
1146 | * @duplex: stores the current duplex | 1146 | * @duplex: stores the current duplex |
@@ -1176,7 +1176,7 @@ s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, u16 *dup | |||
1176 | } | 1176 | } |
1177 | 1177 | ||
1178 | /** | 1178 | /** |
1179 | * e1000e_get_speed_and_duplex_fiber_serdes - Retreive current speed/duplex | 1179 | * e1000e_get_speed_and_duplex_fiber_serdes - Retrieve current speed/duplex |
1180 | * @hw: pointer to the HW structure | 1180 | * @hw: pointer to the HW structure |
1181 | * @speed: stores the current speed | 1181 | * @speed: stores the current speed |
1182 | * @duplex: stores the current duplex | 1182 | * @duplex: stores the current duplex |
@@ -1386,7 +1386,7 @@ s32 e1000e_cleanup_led_generic(struct e1000_hw *hw) | |||
1386 | * e1000e_blink_led - Blink LED | 1386 | * e1000e_blink_led - Blink LED |
1387 | * @hw: pointer to the HW structure | 1387 | * @hw: pointer to the HW structure |
1388 | * | 1388 | * |
1389 | * Blink the led's which are set to be on. | 1389 | * Blink the LEDs which are set to be on. |
1390 | **/ | 1390 | **/ |
1391 | s32 e1000e_blink_led(struct e1000_hw *hw) | 1391 | s32 e1000e_blink_led(struct e1000_hw *hw) |
1392 | { | 1392 | { |
@@ -1491,7 +1491,7 @@ void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop) | |||
1491 | * @hw: pointer to the HW structure | 1491 | * @hw: pointer to the HW structure |
1492 | * | 1492 | * |
1493 | * Returns 0 if successful, else returns -10 | 1493 | * Returns 0 if successful, else returns -10 |
1494 | * (-E1000_ERR_MASTER_REQUESTS_PENDING) if master disable bit has not casued | 1494 | * (-E1000_ERR_MASTER_REQUESTS_PENDING) if master disable bit has not caused |
1495 | * the master requests to be disabled. | 1495 | * the master requests to be disabled. |
1496 | * | 1496 | * |
1497 | * Disables PCI-Express master access and verifies there are no pending | 1497 | * Disables PCI-Express master access and verifies there are no pending |
@@ -1852,7 +1852,7 @@ static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw) | |||
1852 | } | 1852 | } |
1853 | 1853 | ||
1854 | /** | 1854 | /** |
1855 | * e1000e_read_nvm_spi - Read EEPROM's using SPI | 1855 | * e1000e_read_nvm_spi - Reads EEPROM using SPI |
1856 | * @hw: pointer to the HW structure | 1856 | * @hw: pointer to the HW structure |
1857 | * @offset: offset of word in the EEPROM to read | 1857 | * @offset: offset of word in the EEPROM to read |
1858 | * @words: number of words to read | 1858 | * @words: number of words to read |
@@ -1956,7 +1956,7 @@ s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) | |||
1956 | * Writes data to EEPROM at offset using SPI interface. | 1956 | * Writes data to EEPROM at offset using SPI interface. |
1957 | * | 1957 | * |
1958 | * If e1000e_update_nvm_checksum is not called after this function , the | 1958 | * If e1000e_update_nvm_checksum is not called after this function , the |
1959 | * EEPROM will most likley contain an invalid checksum. | 1959 | * EEPROM will most likely contain an invalid checksum. |
1960 | **/ | 1960 | **/ |
1961 | s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) | 1961 | s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) |
1962 | { | 1962 | { |
@@ -2198,7 +2198,7 @@ static u8 e1000_calculate_checksum(u8 *buffer, u32 length) | |||
2198 | * | 2198 | * |
2199 | * Returns E1000_success upon success, else E1000_ERR_HOST_INTERFACE_COMMAND | 2199 | * Returns E1000_success upon success, else E1000_ERR_HOST_INTERFACE_COMMAND |
2200 | * | 2200 | * |
2201 | * This function checks whether the HOST IF is enabled for command operaton | 2201 | * This function checks whether the HOST IF is enabled for command operation |
2202 | * and also checks whether the previous command is completed. It busy waits | 2202 | * and also checks whether the previous command is completed. It busy waits |
2203 | * in case of previous command is not completed. | 2203 | * in case of previous command is not completed. |
2204 | **/ | 2204 | **/ |
@@ -2230,7 +2230,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw) | |||
2230 | } | 2230 | } |
2231 | 2231 | ||
2232 | /** | 2232 | /** |
2233 | * e1000e_check_mng_mode - check managament mode | 2233 | * e1000e_check_mng_mode - check management mode |
2234 | * @hw: pointer to the HW structure | 2234 | * @hw: pointer to the HW structure |
2235 | * | 2235 | * |
2236 | * Reads the firmware semaphore register and returns true (>0) if | 2236 | * Reads the firmware semaphore register and returns true (>0) if |