diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
| commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
| tree | 856ba96302a36014736747e8464f80eeb827bbdd /drivers/net | |
| parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
| parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'drivers/net')
60 files changed, 90 insertions, 85 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index ea6b139b812c..1663bc9e45de 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | TBD: | 19 | TBD: |
| 20 | * look at deferring rx frames rather than discarding (as per tulip) | 20 | * look at deferring rx frames rather than discarding (as per tulip) |
| 21 | * handle tx ring full as per tulip | 21 | * handle tx ring full as per tulip |
| 22 | * performace test to tune rx_copybreak | 22 | * performance test to tune rx_copybreak |
| 23 | 23 | ||
| 24 | Most of my modifications relate to the braindead big-endian | 24 | Most of my modifications relate to the braindead big-endian |
| 25 | implementation by Intel. When the i596 is operating in | 25 | implementation by Intel. When the i596 is operating in |
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 4e6359fff0e1..766aabfdfc75 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
| @@ -1633,8 +1633,13 @@ static int amd8111e_enable_link_change(struct amd8111e_priv* lp) | |||
| 1633 | readl(lp->mmio + CMD7); | 1633 | readl(lp->mmio + CMD7); |
| 1634 | return 0; | 1634 | return 0; |
| 1635 | } | 1635 | } |
| 1636 | /* This function is called when a packet transmission fails to complete within a resonable period, on the assumption that an interrupts have been failed or the interface is locked up. This function will reinitialize the hardware */ | ||
| 1637 | 1636 | ||
| 1637 | /* | ||
| 1638 | * This function is called when a packet transmission fails to complete | ||
| 1639 | * within a reasonable period, on the assumption that an interrupt have | ||
| 1640 | * failed or the interface is locked up. This function will reinitialize | ||
| 1641 | * the hardware. | ||
| 1642 | */ | ||
| 1638 | static void amd8111e_tx_timeout(struct net_device *dev) | 1643 | static void amd8111e_tx_timeout(struct net_device *dev) |
| 1639 | { | 1644 | { |
| 1640 | struct amd8111e_priv* lp = netdev_priv(dev); | 1645 | struct amd8111e_priv* lp = netdev_priv(dev); |
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 50cecf417471..73b38c204eb9 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
| @@ -120,7 +120,7 @@ static int irq = 5; /* Default IRQ */ | |||
| 120 | * DAYNA driver mode: | 120 | * DAYNA driver mode: |
| 121 | * Dayna DL2000/DaynaTalk PC (Half Length), COPS LT-95, | 121 | * Dayna DL2000/DaynaTalk PC (Half Length), COPS LT-95, |
| 122 | * Farallon PhoneNET PC III, Farallon PhoneNET PC II | 122 | * Farallon PhoneNET PC III, Farallon PhoneNET PC II |
| 123 | * Other cards possibly supported mode unkown though: | 123 | * Other cards possibly supported mode unknown though: |
| 124 | * Dayna DL2000 (Full length), COPS LT/M (Micro-Channel) | 124 | * Dayna DL2000 (Full length), COPS LT/M (Micro-Channel) |
| 125 | * | 125 | * |
| 126 | * Cards NOT supported by this driver but supported by the ltpc.c | 126 | * Cards NOT supported by this driver but supported by the ltpc.c |
diff --git a/drivers/net/ariadne.h b/drivers/net/ariadne.h index bb613f292e04..727be5cdd1ea 100644 --- a/drivers/net/ariadne.h +++ b/drivers/net/ariadne.h | |||
| @@ -244,7 +244,7 @@ struct Am79C960 { | |||
| 244 | #define DLNKTST 0x0010 /* Disable Link Status */ | 244 | #define DLNKTST 0x0010 /* Disable Link Status */ |
| 245 | #define DAPC 0x0008 /* Disable Automatic Polarity Correction */ | 245 | #define DAPC 0x0008 /* Disable Automatic Polarity Correction */ |
| 246 | #define MENDECL 0x0004 /* MENDEC Loopback Mode */ | 246 | #define MENDECL 0x0004 /* MENDEC Loopback Mode */ |
| 247 | #define LRTTSEL 0x0002 /* Low Receive Treshold/Transmit Mode Select */ | 247 | #define LRTTSEL 0x0002 /* Low Receive Threshold/Transmit Mode Select */ |
| 248 | #define PORTSEL1 0x0001 /* Port Select Bits */ | 248 | #define PORTSEL1 0x0001 /* Port Select Bits */ |
| 249 | #define PORTSEL2 0x8000 /* Port Select Bits */ | 249 | #define PORTSEL2 0x8000 /* Port Select Bits */ |
| 250 | #define INTL 0x4000 /* Internal Loopback */ | 250 | #define INTL 0x4000 /* Internal Loopback */ |
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c index 1e2f57d4c367..6eb9241cee0a 100644 --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c | |||
| @@ -1540,7 +1540,7 @@ static irqreturn_t atl1c_intr(int irq, void *data) | |||
| 1540 | if (status & ISR_OVER) | 1540 | if (status & ISR_OVER) |
| 1541 | if (netif_msg_intr(adapter)) | 1541 | if (netif_msg_intr(adapter)) |
| 1542 | dev_warn(&pdev->dev, | 1542 | dev_warn(&pdev->dev, |
| 1543 | "TX/RX over flow (status = 0x%x)\n", | 1543 | "TX/RX overflow (status = 0x%x)\n", |
| 1544 | status & ISR_OVER); | 1544 | status & ISR_OVER); |
| 1545 | 1545 | ||
| 1546 | /* link event */ | 1546 | /* link event */ |
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h index e7323be507d0..92b87ef156ed 100644 --- a/drivers/net/benet/be_cmds.h +++ b/drivers/net/benet/be_cmds.h | |||
| @@ -444,7 +444,7 @@ enum be_if_flags { | |||
| 444 | * filtering capabilities. */ | 444 | * filtering capabilities. */ |
| 445 | struct be_cmd_req_if_create { | 445 | struct be_cmd_req_if_create { |
| 446 | struct be_cmd_req_hdr hdr; | 446 | struct be_cmd_req_hdr hdr; |
| 447 | u32 version; /* ignore currntly */ | 447 | u32 version; /* ignore currently */ |
| 448 | u32 capability_flags; | 448 | u32 capability_flags; |
| 449 | u32 enable_flags; | 449 | u32 enable_flags; |
| 450 | u8 mac_addr[ETH_ALEN]; | 450 | u8 mac_addr[ETH_ALEN]; |
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 957a0f7f2764..24c7d9900baa 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
| @@ -1982,7 +1982,7 @@ int be_load_fw(struct be_adapter *adapter, u8 *func) | |||
