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 3d9dd756 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 08d09997 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 ...
No related branches found
No related tags found
Showing
- Documentation/networking/xfrm_sync.txt 166 additions, 0 deletionsDocumentation/networking/xfrm_sync.txt
- drivers/net/irda/irda-usb.c 4 additions, 2 deletionsdrivers/net/irda/irda-usb.c
- drivers/net/irda/smsc-ircc2.c 264 additions, 52 deletionsdrivers/net/irda/smsc-ircc2.c
- include/net/arp.h 0 additions, 2 deletionsinclude/net/arp.h
- include/net/xfrm.h 8 additions, 0 deletionsinclude/net/xfrm.h
- net/atm/clip.c 218 additions, 242 deletionsnet/atm/clip.c
- net/ipv4/arp.c 2 additions, 2 deletionsnet/ipv4/arp.c
- net/ipv4/devinet.c 0 additions, 1 deletionnet/ipv4/devinet.c
- net/ipv4/fib_frontend.c 0 additions, 1 deletionnet/ipv4/fib_frontend.c
- net/ipv4/inet_hashtables.c 0 additions, 4 deletionsnet/ipv4/inet_hashtables.c
- net/ipv4/ip_output.c 1 addition, 1 deletionnet/ipv4/ip_output.c
- net/ipv4/tcp_input.c 0 additions, 1 deletionnet/ipv4/tcp_input.c
- net/ipv4/tcp_ipv4.c 0 additions, 1 deletionnet/ipv4/tcp_ipv4.c
- net/ipv4/tcp_output.c 0 additions, 3 deletionsnet/ipv4/tcp_output.c
- net/xfrm/xfrm_state.c 19 additions, 6 deletionsnet/xfrm/xfrm_state.c
Loading
Please register or sign in to comment