aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ixgb/ixgb.h4
-rw-r--r--drivers/net/ixgb/ixgb_ee.c6
-rw-r--r--drivers/net/ixgb/ixgb_ee.h10
-rw-r--r--drivers/net/ixgb/ixgb_hw.c4
-rw-r--r--drivers/net/ixgb/ixgb_main.c2
5 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
index 69529ec9dfe1..6cb4dde07aaa 100644
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -94,8 +94,8 @@ struct ixgb_adapter;
94#define MIN_TXD 64 94#define MIN_TXD 64
95 95
96/* hardware cannot reliably support more than 512 descriptors owned by 96/* hardware cannot reliably support more than 512 descriptors owned by
97 * hardware descrioptor cache otherwise an unreliable ring under heavy 97 * hardware descriptor cache otherwise an unreliable ring under heavy
98 * recieve load may result */ 98 * receive load may result */
99/* #define DEFAULT_RXD 1024 */ 99/* #define DEFAULT_RXD 1024 */
100/* #define MAX_RXD 4096 */ 100/* #define MAX_RXD 4096 */
101#define DEFAULT_RXD 512 101#define DEFAULT_RXD 512
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c
index 8bc9716b6ce0..aa71b9b1cc98 100644
--- a/drivers/net/ixgb/ixgb_ee.c
+++ b/drivers/net/ixgb/ixgb_ee.c
@@ -205,7 +205,7 @@ ixgb_standby_eeprom(struct ixgb_hw *hw)
205 205
206 eecd_reg = IXGB_READ_REG(hw, EECD); 206 eecd_reg = IXGB_READ_REG(hw, EECD);
207 207
208 /* Deselct EEPROM */ 208 /* Deselect EEPROM */
209 eecd_reg &= ~(IXGB_EECD_CS | IXGB_EECD_SK); 209 eecd_reg &= ~(IXGB_EECD_CS | IXGB_EECD_SK);
210 IXGB_WRITE_REG(hw, EECD, eecd_reg); 210 IXGB_WRITE_REG(hw, EECD, eecd_reg);
211 udelay(50); 211 udelay(50);
@@ -293,7 +293,7 @@ ixgb_wait_eeprom_command(struct ixgb_hw *hw)
293 */ 293 */
294 ixgb_standby_eeprom(hw); 294 ixgb_standby_eeprom(hw);
295 295
296 /* Now read DO repeatedly until is high (equal to '1'). The EEEPROM will 296 /* Now read DO repeatedly until is high (equal to '1'). The EEPROM will
297 * signal that the command has been completed by raising the DO signal. 297 * signal that the command has been completed by raising the DO signal.
298 * If DO does not go high in 10 milliseconds, then error out. 298 * If DO does not go high in 10 milliseconds, then error out.
299 */ 299 */
@@ -365,7 +365,7 @@ ixgb_update_eeprom_checksum(struct ixgb_hw *hw)
365 * 365 *
366 * hw - Struct containing variables accessed by shared code 366 * hw - Struct containing variables accessed by shared code
367 * reg - offset within the EEPROM to be written to 367 * reg - offset within the EEPROM to be written to
368 * data - 16 bit word to be writen to the EEPROM 368 * data - 16 bit word to be written to the EEPROM
369 * 369 *
370 * If ixgb_update_eeprom_checksum is not called after this function, the 370 * If ixgb_update_eeprom_checksum is not called after this function, the
371 * EEPROM will most likely contain an invalid checksum. 371 * EEPROM will most likely contain an invalid checksum.
diff --git a/drivers/net/ixgb/ixgb_ee.h b/drivers/net/ixgb/ixgb_ee.h
index 4b7bd0d4a8a9..12136b633497 100644
--- a/drivers/net/ixgb/ixgb_ee.h
+++ b/drivers/net/ixgb/ixgb_ee.h
@@ -34,11 +34,11 @@
34#define IXGB_ETH_LENGTH_OF_ADDRESS 6 34#define IXGB_ETH_LENGTH_OF_ADDRESS 6
35 35
36/* EEPROM Commands */ 36/* EEPROM Commands */
37#define EEPROM_READ_OPCODE 0x6 /* EERPOM read opcode */ 37#define EEPROM_READ_OPCODE 0x6 /* EEPROM read opcode */
38#define EEPROM_WRITE_OPCODE 0x5 /* EERPOM write opcode */ 38#define EEPROM_WRITE_OPCODE 0x5 /* EEPROM write opcode */
39#define EEPROM_ERASE_OPCODE 0x7 /* EERPOM erase opcode */ 39#define EEPROM_ERASE_OPCODE 0x7 /* EEPROM erase opcode */
40#define EEPROM_EWEN_OPCODE 0x13 /* EERPOM erase/write enable */ 40#define EEPROM_EWEN_OPCODE 0x13 /* EEPROM erase/write enable */
41#define EEPROM_EWDS_OPCODE 0x10 /* EERPOM erast/write disable */ 41#define EEPROM_EWDS_OPCODE 0x10 /* EEPROM erase/write disable */
42 42
43/* EEPROM MAP (Word Offsets) */ 43/* EEPROM MAP (Word Offsets) */
44#define EEPROM_IA_1_2_REG 0x0000 44#define EEPROM_IA_1_2_REG 0x0000
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
index d023fb59bf15..3694e8c7b005 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ixgb/ixgb_hw.c
@@ -371,7 +371,7 @@ ixgb_init_hw(struct ixgb_hw *hw)
371 * hw - Struct containing variables accessed by shared code 371 * hw - Struct containing variables accessed by shared code
372 * 372 *
373 * Places the MAC address in receive address register 0 and clears the rest 373 * Places the MAC address in receive address register 0 and clears the rest
374 * of the receive addresss registers. Clears the multicast table. Assumes 374 * of the receive address registers. Clears the multicast table. Assumes
375 * the receiver is in reset when the routine is called. 375 * the receiver is in reset when the routine is called.
376 *****************************************************************************/ 376 *****************************************************************************/
377static void 377static void
@@ -964,7 +964,7 @@ ixgb_check_for_link(struct ixgb_hw *hw)
964} 964}
965 965
966/****************************************************************************** 966/******************************************************************************
967 * Check for a bad link condition that may have occured. 967 * Check for a bad link condition that may have occurred.
968 * The indication is that the RFC / LFC registers may be incrementing 968 * The indication is that the RFC / LFC registers may be incrementing
969 * continually. A full adapter reset is required to recover. 969 * continually. A full adapter reset is required to recover.
970 * 970 *
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index fc211a3f7c8c..796f01109d74 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -2248,7 +2248,7 @@ static pci_ers_result_t ixgb_io_error_detected(struct pci_dev *pdev,
2248 * ixgb_io_slot_reset - called after the pci bus has been reset. 2248 * ixgb_io_slot_reset - called after the pci bus has been reset.
2249 * @pdev pointer to pci device with error 2249 * @pdev pointer to pci device with error
2250 * 2250 *
2251 * This callback is called after the PCI buss has been reset. 2251 * This callback is called after the PCI bus has been reset.
2252 * Basically, this tries to restart the card from scratch. 2252 * Basically, this tries to restart the card from scratch.
2253 * This is a shortened version of the device probe/discovery code, 2253 * This is a shortened version of the device probe/discovery code,
2254 * it resembles the first-half of the ixgb_probe() routine. 2254 * it resembles the first-half of the ixgb_probe() routine.