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: (25 commits) [XFRM]: Fix OOPSes in xfrm_audit_log(). [TCP]: cleanup of htcp (resend) [TCP]: Use read mostly for CUBIC parameters. [NETFILTER]: nf_conntrack_tcp: make sysctl variables static [NETFILTER]: ip6t_mh: drop piggyback payload packet on MH packets [NETFILTER]: Fix whitespace errors [NETFILTER]: Kconfig: improve dependency handling [NETFILTER]: xt_mac/xt_CLASSIFY: use IPv6 hook names for IPv6 registration [NETFILTER]: nf_conntrack: change nf_conntrack_l[34]proto_unregister to void [NETFILTER]: nf_conntrack: properly use RCU for nf_conntrack_destroyed callback [NETFILTER]: ip_conntrack: properly use RCU for ip_conntrack_destroyed callback [NETFILTER]: nf_conntrack: fix invalid conntrack statistics RCU assumption [NETFILTER]: ip_conntrack: fix invalid conntrack statistics RCU assumption [NETFILTER]: nf_conntrack: properly use RCU API for nf_ct_protos/nf_ct_l3protos arrays [NETFILTER]: ip_conntrack: properly use RCU API for ip_ct_protos array [NETFILTER]: nf_nat: properly use RCU API for nf_nat_protos array [NETFILTER]: ip_nat: properly use RCU API for ip_nat_protos array [NETFILTER]: nf_log: minor cleanups [NETFILTER]: nf_log: switch logger registration/unregistration to mutex [NETFILTER]: nf_log: make nf_log_unregister_pf return void ...
Showing
- include/linux/netfilter.h 2 additions, 2 deletionsinclude/linux/netfilter.h
- include/linux/netfilter_ipv4/ip_conntrack.h 6 additions, 0 deletionsinclude/linux/netfilter_ipv4/ip_conntrack.h
- include/net/netfilter/nf_conntrack.h 6 additions, 0 deletionsinclude/net/netfilter/nf_conntrack.h
- include/net/netfilter/nf_conntrack_l3proto.h 2 additions, 2 deletionsinclude/net/netfilter/nf_conntrack_l3proto.h
- include/net/netfilter/nf_conntrack_l4proto.h 1 addition, 1 deletioninclude/net/netfilter/nf_conntrack_l4proto.h
- net/bridge/netfilter/ebt_log.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_log.c
- net/bridge/netfilter/ebt_ulog.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_ulog.c
- net/ipv4/netfilter/Kconfig 5 additions, 3 deletionsnet/ipv4/netfilter/Kconfig
- net/ipv4/netfilter/ip_conntrack_core.c 32 additions, 19 deletionsnet/ipv4/netfilter/ip_conntrack_core.c
- net/ipv4/netfilter/ip_conntrack_standalone.c 4 additions, 5 deletionsnet/ipv4/netfilter/ip_conntrack_standalone.c
- net/ipv4/netfilter/ip_nat_core.c 37 additions, 37 deletionsnet/ipv4/netfilter/ip_nat_core.c
- net/ipv4/netfilter/ipt_LOG.c 1 addition, 1 deletionnet/ipv4/netfilter/ipt_LOG.c
- net/ipv4/netfilter/ipt_ULOG.c 1 addition, 1 deletionnet/ipv4/netfilter/ipt_ULOG.c
- net/ipv4/netfilter/nf_conntrack_proto_icmp.c 2 additions, 0 deletionsnet/ipv4/netfilter/nf_conntrack_proto_icmp.c
- net/ipv4/netfilter/nf_nat_core.c 37 additions, 38 deletionsnet/ipv4/netfilter/nf_nat_core.c
- net/ipv4/tcp_cubic.c 10 additions, 10 deletionsnet/ipv4/tcp_cubic.c
- net/ipv4/tcp_htcp.c 37 additions, 28 deletionsnet/ipv4/tcp_htcp.c
- net/ipv6/netfilter/Kconfig 2 additions, 1 deletionnet/ipv6/netfilter/Kconfig
- net/ipv6/netfilter/ip6t_LOG.c 1 addition, 1 deletionnet/ipv6/netfilter/ip6t_LOG.c
- net/ipv6/netfilter/ip6t_mh.c 7 additions, 0 deletionsnet/ipv6/netfilter/ip6t_mh.c
Please register or sign in to comment