diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/lib82596.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/lib82596.c')
| -rw-r--r-- | drivers/net/lib82596.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index 51e11c3e53e1..c0dbfc185b53 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | TBD: | 47 | TBD: |
| 48 | * look at deferring rx frames rather than discarding (as per tulip) | 48 | * look at deferring rx frames rather than discarding (as per tulip) |
| 49 | * handle tx ring full as per tulip | 49 | * handle tx ring full as per tulip |
| 50 | * performace test to tune rx_copybreak | 50 | * performance test to tune rx_copybreak |
| 51 | 51 | ||
| 52 | Most of my modifications relate to the braindead big-endian | 52 | Most of my modifications relate to the braindead big-endian |
| 53 | implementation by Intel. When the i596 is operating in | 53 | implementation by Intel. When the i596 is operating in |