Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPv6]: Fix ICMPv6 redirect handling with target multicast address [PKT_SCHED] cls_u32: error code isn't been propogated properly [ROSE]: Fix rose.ko oops on unload [TCP]: Fix fastpath_cnt_hint when GSO skb is partially ACKed
No related branches found
No related tags found
Showing
- include/net/rose.h 1 addition, 1 deletioninclude/net/rose.h
- net/ipv4/tcp_input.c 3 additions, 0 deletionsnet/ipv4/tcp_input.c
- net/ipv6/ndisc.c 5 additions, 4 deletionsnet/ipv6/ndisc.c
- net/rose/rose_loopback.c 2 additions, 2 deletionsnet/rose/rose_loopback.c
- net/rose/rose_route.c 10 additions, 5 deletionsnet/rose/rose_route.c
- net/sched/cls_u32.c 1 addition, 1 deletionnet/sched/cls_u32.c
Loading
Please register or sign in to comment