aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2008-06-139-92/+51
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-06-136-88/+31
| |\
| | * tcp: Revert 'process defer accept as established' changes.David S. Miller2008-06-126-88/+31
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-06-113-4/+6
| |\ \ | | |/
| | * net: Fix routing tables with id > 255 for legacy softwareKrzysztof Piotr Oledzki2008-06-101-1/+4
| | * inet{6}_request_sock: Init ->opt and ->pktopts in the constructorArnaldo Carvalho de Melo2008-06-102-3/+2
| * | asn1: additional sanity checking during BER decodingChris Wright2008-06-051-0/+14
| |/
* | Merge branch 'net-next-2.6-misc-20080612a' of git://git.linux-ipv6.org/gitroo...David S. Miller2008-06-114-133/+144
|\ \
| * | tcp md5sig: Let the caller pass appropriate key for tcp_v{4,6}_do_calc_md5_ha...YOSHIFUJI Hideaki2008-06-121-30/+20
| * | tcp md5sig: Share most of hash calcucaltion bits between IPv4 and IPv6.YOSHIFUJI Hideaki2008-06-122-48/+74
| * | tcp md5sig: Remove redundant protocol argument.YOSHIFUJI Hideaki2008-06-122-14/+9
| * | tcp md5sig: Share MD5 Signature option parser between IPv4 and IPv6.YOSHIFUJI Hideaki2008-06-122-41/+41
* | | net: remove CVS keywordsAdrian Bunk2008-06-1159-118/+0
|/ /
* | ipv4 addr: Send netlink notification for address label changesThomas Graf2008-06-101-1/+3
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2008-06-109-27/+45
|\ \ | |/
| * tcp: Fix for race due to temporary drop of the socket lock in skb_splice_bits.Octavian Purdila2008-06-041-1/+8
| * tcp: Increment OUTRSTS in tcp_send_active_reset()Sridhar Samudrala2008-06-041-0/+2
| * raw: Raw socket leak.Denis V. Lunev2008-06-041-0/+9
| * Merge branch 'net-2.6-misc-20080605a' of git://git.linux-ipv6.org/gitroot/yos...David S. Miller2008-06-042-2/+3
| |\
| | * [IPV6]: inet_sk(sk)->cork.opt leakDenis V. Lunev2008-06-051-1/+2
| | * [IPV4] TUNNEL4: Fix incoming packet length check for inter-protocol tunnel.YOSHIFUJI Hideaki2008-06-051-1/+1
| * | tcp: fix skb vs fack_count out-of-sync conditionIlpo Järvinen2008-06-041-3/+3
| * | tcp: Fix inconsistency source (CA_Open only when !tcp_left_out(tp))Ilpo Järvinen2008-06-041-10/+19
| * | route: Remove unused ifa_anycast fieldThomas Graf2008-06-031-9/+0
| * | route: Mark unused routing attributes as suchThomas Graf2008-06-031-1/+0
| * | route: Mark unused route cache flags as such.Thomas Graf2008-06-031-1/+1
| |/
* | netfilter: {ip,ip6,nfnetlink}_queue: misc cleanupsRami Rosen2008-06-091-3/+0
* | netfilter: nf_conntrack: properly account terminating packetsFabian Hugelshofer2008-06-091-1/+1
* | netfilter: nf_conntrack: add nf_ct_kill()Patrick McHardy2008-06-091-3/+2
* | netfilter: ip_tables: add iptables security table for mandatory access contro...James Morris2008-06-093-0/+193
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2008-05-255-282/+11
|\ \ | |/
| * net: The world is not perfect patch.Rami Rosen2008-05-212-274/+2
| * net/ipv4/arp.c: Use common hex_asc helpersDenis Cheng2008-05-211-3/+2
| * tcp: TCP connection times out if ICMP frag needed is delayedSridhar Samudrala2008-05-211-4/+6
| * ipsec: Use the correct ip_local_out functionHerbert Xu2008-05-201-1/+1
* | ipmr: Use on-device stats instead of private ones.Pavel Emelyanov2008-05-211-16/+9
* | ipmr: Ipip tunnel uses on-device stats.Pavel Emelyanov2008-05-211-2/+2
* | ipip: Use on-device stats instead of private ones.Pavel Emelyanov2008-05-211-14/+8
* | ipgre: Use on-device stats instead of private ones.Pavel Emelyanov2008-05-211-18/+14
* | inet: Register fragmentation some ctls at read-only root.Pavel Emelyanov2008-05-191-2/+14
* | inet: Rename fragmentation sysctl-related functions/variables.Pavel Emelyanov2008-05-191-9/+9
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-05-146-19/+24
|\
| * cipso: Relax too much careful cipso hash function.Pavel Emelyanov2008-05-131-2/+2
| * tcp FRTO: work-around inorder receiversIlpo Järvinen2008-05-131-4/+11
| * tcp FRTO: Fix fallback to conventional recoveryIlpo Järvinen2008-05-131-1/+1
| * net: Allow netdevices to specify needed head/tailroomJohannes Berg2008-05-124-12/+10
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-05-082-6/+9
|\ \ | |/
| * net/ipv4: correct RFC 1122 section reference in commentJ.H.M. Dassen (Ray)2008-05-081-1/+1
| * tcp FRTO: SACK variant is errorneously used with NewRenoIlpo Järvinen2008-05-081-5/+8
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-05-062-16/+17
|\ \ | |/