diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 20:10:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 20:10:20 -0400 |
| commit | 1b627d173e0e1014298b92311f869eed53963bf3 (patch) | |
| tree | 18b35eaa8add95ea8cea3c3d98151da8a36c62b8 /block | |
| parent | f2f4d9e8cb7d4180ac1830eec49e18fef701c58c (diff) | |
| parent | 3d9dd7564d5d7c28eb87b14c13a23806484667f3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (170 commits)
commit 3d9dd7564d5d7c28eb87b14c13a23806484667f3
Author: Zach Brown <zach.brown@oracle.com>
Date: Fri Apr 14 16:04:18 2006 -0700
[PATCH] ip_output: account for fraggap when checking to add trailer_len
During other work I noticed that ip_append_data() seemed to be forgetting to
include the frag gap in its calculation of a fragment that consumes the rest of
the payload. Herbert confirmed that this was a bug that snuck in during a
previous rework.
Signed-off-by: Zach Brown <zach.brown@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 08d099974a09faf4cb11ffc46da87073fa132fc0
Author: Linus Walleij <triad@df.lth.se>
Date: Fri Apr 14 16:03:33 2006 -0700
[IRDA]: smsc-ircc2, smcinit support for ALi ISA bridges
...
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions