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: (42 commits) [IPV6]: Consolidate the ip6_pol_route_(input|output) pair [TCP]: Make snd_cwnd_cnt 32-bit [TCP]: Update the /proc/net/tcp documentation [NETNS]: Don't panic on creating the namespace's loopback [NEIGH]: Ensure that pneigh_lookup is protected with RTNL [INET]: kmalloc+memset -> kzalloc in frag_alloc_queue [ISDN]: Fix compile with CONFIG_ISDN_X25 disabled. [IPV6]: Replace sk_buff ** with sk_buff * in input handlers [SELINUX]: Update for netfilter ->hook() arg changes. [INET]: Consolidate the xxx_put [INET]: Small cleanup for xxx_put after evictor consolidation [INET]: Consolidate the xxx_evictor [INET]: Consolidate the xxx_frag_destroy [INET]: Consolidate xxx_the secret_rebuild [INET]: Consolidate the xxx_frag_kill [INET]: Collect common frag sysctl variables together [INET]: Collect frag queues management objects together [INET]: Move common fields from frag_queues in one place. [TG3]: Fix performance regression on 5705. [ISDN]: Remove local copy of device name to make sure renames work. ...
No related branches found
No related tags found
Showing
- Documentation/networking/proc_net_tcp.txt 3 additions, 2 deletionsDocumentation/networking/proc_net_tcp.txt
- drivers/isdn/i4l/isdn_net.c 80 additions, 66 deletionsdrivers/isdn/i4l/isdn_net.c
- drivers/isdn/i4l/isdn_ppp.c 6 additions, 3 deletionsdrivers/isdn/i4l/isdn_ppp.c
- drivers/net/loopback.c 5 additions, 6 deletionsdrivers/net/loopback.c
- drivers/net/niu.c 9 additions, 10 deletionsdrivers/net/niu.c
- drivers/net/tg3.c 8 additions, 2 deletionsdrivers/net/tg3.c
- include/linux/if_bridge.h 1 addition, 1 deletioninclude/linux/if_bridge.h
- include/linux/isdn.h 0 additions, 1 deletioninclude/linux/isdn.h
- include/linux/netfilter.h 13 additions, 13 deletionsinclude/linux/netfilter.h
- include/linux/netfilter/nf_conntrack_amanda.h 1 addition, 1 deletioninclude/linux/netfilter/nf_conntrack_amanda.h
- include/linux/netfilter/nf_conntrack_ftp.h 1 addition, 1 deletioninclude/linux/netfilter/nf_conntrack_ftp.h
- include/linux/netfilter/nf_conntrack_h323.h 9 additions, 9 deletionsinclude/linux/netfilter/nf_conntrack_h323.h
- include/linux/netfilter/nf_conntrack_irc.h 1 addition, 1 deletioninclude/linux/netfilter/nf_conntrack_irc.h
- include/linux/netfilter/nf_conntrack_pptp.h 2 additions, 2 deletionsinclude/linux/netfilter/nf_conntrack_pptp.h
- include/linux/netfilter/nf_conntrack_sip.h 2 additions, 2 deletionsinclude/linux/netfilter/nf_conntrack_sip.h
- include/linux/netfilter/nf_conntrack_tftp.h 1 addition, 1 deletioninclude/linux/netfilter/nf_conntrack_tftp.h
- include/linux/netfilter/x_tables.h 1 addition, 1 deletioninclude/linux/netfilter/x_tables.h
- include/linux/netfilter_arp/arp_tables.h 1 addition, 1 deletioninclude/linux/netfilter_arp/arp_tables.h
- include/linux/netfilter_bridge/ebtables.h 2 additions, 2 deletionsinclude/linux/netfilter_bridge/ebtables.h
- include/linux/netfilter_ipv4.h 2 additions, 2 deletionsinclude/linux/netfilter_ipv4.h
Loading
Please register or sign in to comment