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: (21 commits) [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts [IPV4] SNMP: Support InMcastPkts and InBcastPkts [IPV4] SNMP: Support InTruncatedPkts [IPV4] SNMP: Support InNoRoutes [SNMP]: Add definitions for {In,Out}BcastPkts [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent [TCP] FRTO: Delay skb available check until it's mandatory [XFRM]: Restrict upper layer information by bundle. [TCP]: Catch skb with S+L bugs earlier [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo [L2TP]: Add the ability to autoload a pppox protocol module. [SKB]: Introduce skb_queue_walk_safe() [AF_IUCV/IUCV]: smp_call_function deadlock [IPV6]: Fix slab corruption running ip6sic [TCP]: Update references in two old comments [XFRM]: Export SPD info [IPV6]: Track device renames in snmp6. [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage. [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats. [NETPOLL]: Remove CONFIG_NETPOLL_RX ...
Showing
- arch/s390/appldata/appldata_net_sum.c 0 additions, 3 deletionsarch/s390/appldata/appldata_net_sum.c
- drivers/net/Kconfig 0 additions, 5 deletionsdrivers/net/Kconfig
- drivers/net/bonding/bond_main.c 25 additions, 34 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/pppox.c 8 additions, 0 deletionsdrivers/net/pppox.c
- drivers/parisc/led.c 0 additions, 2 deletionsdrivers/parisc/led.c
- include/linux/netdevice.h 3 additions, 6 deletionsinclude/linux/netdevice.h
- include/linux/skbuff.h 5 additions, 0 deletionsinclude/linux/skbuff.h
- include/linux/snmp.h 2 additions, 0 deletionsinclude/linux/snmp.h
- include/linux/xfrm.h 35 additions, 0 deletionsinclude/linux/xfrm.h
- include/net/flow.h 6 additions, 0 deletionsinclude/net/flow.h
- include/net/iucv/iucv.h 1 addition, 1 deletioninclude/net/iucv/iucv.h
- include/net/tcp.h 6 additions, 3 deletionsinclude/net/tcp.h
- include/net/xfrm.h 23 additions, 0 deletionsinclude/net/xfrm.h
- net/core/dev.c 20 additions, 25 deletionsnet/core/dev.c
- net/ipv4/ip_input.c 13 additions, 1 deletionnet/ipv4/ip_input.c
- net/ipv4/ip_output.c 6 additions, 0 deletionsnet/ipv4/ip_output.c
- net/ipv4/tcp.c 6 additions, 8 deletionsnet/ipv4/tcp.c
- net/ipv4/tcp_input.c 18 additions, 12 deletionsnet/ipv4/tcp_input.c
- net/ipv4/tcp_output.c 5 additions, 3 deletionsnet/ipv4/tcp_output.c
- net/ipv4/udp.c 114 additions, 57 deletionsnet/ipv4/udp.c
Loading
Please register or sign in to comment