Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: netfilter: nf_conntrack_sctp: fix sparse warnings netfilter: nf_nat_sip: c= is optional for session netfilter: xt_TCPMSS: collapse tcpmss_reverse_mtu{4,6} into one function netfilter: nfnetlink_log: send complete hardware header netfilter: xt_time: fix time's time_mt()'s use of do_div() netfilter: accounting rework: ct_extend + 64bit counters (v4) netlink: add NLA_PUT_BE64 macro netfilter: nf_nat_core: eliminate useless find_appropriate_src for IP_NAT_RANGE_PROTO_RANDOM hdlcdrv: Fix CRC calculation. Revert "pkt_sched: Make default qdisc nonshared-multiqueue safe." net: In __netif_schedule() use WARN_ON instead of BUG_ON net: Improve simple_tx_hash(). pkt_sched: Remove unused variable skb in dev_deactivate_queue function. sunhme: Remove stop/wake TX queue calls in set-multicast-list handler. ucc_geth: do not touch net queue in adjust_link phylib callback gianfar: do not touch net queue in adjust_link phylib callback atl1: Do not wake queue before queue has been started.
Showing
- Documentation/feature-removal-schedule.txt 10 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/kernel-parameters.txt 7 additions, 0 deletionsDocumentation/kernel-parameters.txt
- drivers/net/atlx/atl1.c 1 addition, 2 deletionsdrivers/net/atlx/atl1.c
- drivers/net/gianfar.c 0 additions, 1 deletiondrivers/net/gianfar.c
- drivers/net/hamradio/hdlcdrv.c 1 addition, 0 deletionsdrivers/net/hamradio/hdlcdrv.c
- drivers/net/sunhme.c 0 additions, 4 deletionsdrivers/net/sunhme.c
- drivers/net/ucc_geth.c 0 additions, 1 deletiondrivers/net/ucc_geth.c
- include/linux/netfilter/nf_conntrack_common.h 1 addition, 7 deletionsinclude/linux/netfilter/nf_conntrack_common.h
- include/linux/netfilter/nfnetlink_conntrack.h 4 additions, 4 deletionsinclude/linux/netfilter/nfnetlink_conntrack.h
- include/linux/netfilter/nfnetlink_log.h 3 additions, 0 deletionsinclude/linux/netfilter/nfnetlink_log.h
- include/net/netfilter/nf_conntrack.h 0 additions, 6 deletionsinclude/net/netfilter/nf_conntrack.h
- include/net/netfilter/nf_conntrack_acct.h 51 additions, 0 deletionsinclude/net/netfilter/nf_conntrack_acct.h
- include/net/netfilter/nf_conntrack_extend.h 2 additions, 0 deletionsinclude/net/netfilter/nf_conntrack_extend.h
- include/net/netlink.h 3 additions, 0 deletionsinclude/net/netlink.h
- net/core/dev.c 23 additions, 14 deletionsnet/core/dev.c
- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c 3 additions, 15 deletionsnet/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
- net/ipv4/netfilter/nf_nat_core.c 4 additions, 4 deletionsnet/ipv4/netfilter/nf_nat_core.c
- net/ipv4/netfilter/nf_nat_sip.c 25 additions, 13 deletionsnet/ipv4/netfilter/nf_nat_sip.c
- net/netfilter/Kconfig 9 additions, 0 deletionsnet/netfilter/Kconfig
- net/netfilter/Makefile 1 addition, 1 deletionnet/netfilter/Makefile
Loading
Please register or sign in to comment