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: [IPV4/IPV6]: Fix inet{,6} device initialization order. [TCP]: Use old definition of before [NETFILTER]: ebtables: don't compute gap before checking struct type [NETFILTER]: nf_nat: fix MASQUERADE crash on device down [NETFILTER]: New connection tracking is not EXPERIMENTAL anymore [NETFILTER]: Fix routing of REJECT target generated packets in output chain [NETFILTER]: compat offsets size change [SUNGEM]: PHY updates & pause fixes (#2) [X25]: proper prototype for x25_init_timers() [AF_NETLINK]: module_put cleanup [XFRM_USER]: avoid pointless void ** casts [NETFILTER] xt_hashlimit.c: fix typo [NET] drivers/net/loopback.c: convert to module_init() [PKTGEN]: Convert to kthread API. [NET]: ifb double-counts packets
No related branches found
No related tags found
Showing
- drivers/net/Space.c 0 additions, 11 deletionsdrivers/net/Space.c
- drivers/net/ifb.c 2 additions, 2 deletionsdrivers/net/ifb.c
- drivers/net/loopback.c 3 additions, 1 deletiondrivers/net/loopback.c
- drivers/net/sungem.c 2 additions, 1 deletiondrivers/net/sungem.c
- drivers/net/sungem_phy.c 155 additions, 24 deletionsdrivers/net/sungem_phy.c
- drivers/net/sungem_phy.h 6 additions, 1 deletiondrivers/net/sungem_phy.h
- include/net/tcp.h 1 addition, 1 deletioninclude/net/tcp.h
- include/net/x25.h 1 addition, 0 deletionsinclude/net/x25.h
- net/bridge/netfilter/ebtables.c 2 additions, 1 deletionnet/bridge/netfilter/ebtables.c
- net/core/pktgen.c 48 additions, 108 deletionsnet/core/pktgen.c
- net/ipv4/devinet.c 3 additions, 2 deletionsnet/ipv4/devinet.c
- net/ipv4/netfilter.c 5 additions, 2 deletionsnet/ipv4/netfilter.c
- net/ipv4/netfilter/Kconfig 2 additions, 2 deletionsnet/ipv4/netfilter/Kconfig
- net/ipv4/netfilter/ip_tables.c 5 additions, 5 deletionsnet/ipv4/netfilter/ip_tables.c
- net/ipv4/netfilter/ipt_MASQUERADE.c 4 additions, 1 deletionnet/ipv4/netfilter/ipt_MASQUERADE.c
- net/ipv6/addrconf.c 2 additions, 2 deletionsnet/ipv6/addrconf.c
- net/netfilter/Kconfig 12 additions, 13 deletionsnet/netfilter/Kconfig
- net/netfilter/xt_hashlimit.c 1 addition, 1 deletionnet/netfilter/xt_hashlimit.c
- net/netlink/af_netlink.c 1 addition, 2 deletionsnet/netlink/af_netlink.c
- net/x25/af_x25.c 0 additions, 2 deletionsnet/x25/af_x25.c
Loading
Please register or sign in to comment