summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-01-2071-1465/+3727
|\
| * Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2011-01-1988-720/+839
| |\
| * | netfilter: nf_conntrack: fix lifetime display for disabled connectionsPatrick McHardy2011-01-191-17/+12
| * | netfilter: nf_conntrack_tstamp: add flow-based timestamp extensionPablo Neira Ayuso2011-01-196-1/+244
| * | netfilter: nf_conntrack: nf_conntrack snmp helperJiri Olsa2011-01-187-70/+196
| * | netfilter: ipt_CLUSTERIP: remove "no conntrack!"Eric Dumazet2011-01-181-6/+1
| * | Merge branch 'master' of git://dev.medozas.de/linuxPatrick McHardy2011-01-184-4/+8
| |\ \
| | * | netfilter: xt_connlimit: use hotdrop jump markRichard Weinberger2011-01-181-4/+2
| | * | netfilter: xtables: add missing aliases for autoloading via iptablesJan Engelhardt2011-01-183-0/+6
| * | | netfilter: allow NFQUEUE bypass if no listener is availableFlorian Westphal2011-01-183-4/+34
| * | | netfilter: reduce NF_VERDICT_MASK to 0xffFlorian Westphal2011-01-182-3/+3
| * | | netfilter: nfnetlink_queue: do not free skb on errorFlorian Westphal2011-01-182-9/+15
| * | | netfilter: nfnetlink_queue: return error number to callerFlorian Westphal2011-01-183-23/+49
| * | | netfilter: Kconfig: NFQUEUE is useless without NETFILTER_NETLINK_QUEUEFlorian Westphal2011-01-181-0/+1
| * | | netfilter: nf_conntrack: remove an atomic bit operationChangli Gao2011-01-181-1/+1
| * | | netfilter: nf_nat: fix conversion to non-atomic bit opsChangli Gao2011-01-181-2/+2
| |/ /
| * | netfilter: create audit records for x_tables replacesThomas Graf2011-01-161-0/+16
| * | netfilter: audit target to record accepted/dropped packetsThomas Graf2011-01-163-0/+215
| * | netfilter: nf_conntrack: use is_vmalloc_addr()Patrick McHardy2011-01-144-34/+17
| * | Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6Patrick McHardy2011-01-14364-7487/+20913
| |\ \
| | * | netfilter: ebt_ip6: allow matching on ipv6-icmp types/codesFlorian Westphal2011-01-131-12/+34
| | * | netfilter: x_table: speedup compat operationsEric Dumazet2011-01-135-34/+55
| | * | netfilter: xt_conntrack: support matching on port rangesPatrick McHardy2011-01-131-2/+73
| | * | IPVS: netns, final patch enabling network name space.Hans Schillstrom2011-01-137-32/+1
| | * | IPVS: netns, misc init_net removal in core.Hans Schillstrom2011-01-132-6/+9
| | * | IPVS: netns, svc counters moved in ip_vs_ctl,cHans Schillstrom2011-01-131-12/+9
| | * | IPVS: netns, trash handlingHans Schillstrom2011-01-131-12/+11
| | * | IPVS: netns, defense work timer.Hans Schillstrom2011-01-133-13/+13
| | * | IPVS: netns, ip_vs_ctl local vars moved to ipvs struct.Hans Schillstrom2011-01-137-163/+184
| | * | IPVS: netns, connection hash got net as param.Hans Schillstrom2011-01-139-72/+109
| | * | IPVS: netns, ip_vs_stats and its procfsHans Schillstrom2011-01-133-58/+204
| | * | IPVS: netns awareness to ip_vs_syncHans Schillstrom2011-01-133-182/+219
| | * | IPVS: netns awareness to ip_vs_estHans Schillstrom2011-01-132-48/+58
| | * | IPVS: netns awareness to ip_vs_appHans Schillstrom2011-01-135-52/+65
| | * | IPVS: netns, common protocol changes and use of appcnt.Hans Schillstrom2011-01-135-35/+39
| | * | IPVS: netns, use ip_vs_proto_data as param.Hans Schillstrom2011-01-139-98/+123
| | * | IPVS: netns preparation for proto_ah_espHans Schillstrom2011-01-132-16/+10
| | * | IPVS: netns preparation for proto_sctpHans Schillstrom2011-01-132-63/+61
| | * | IPVS: netns preparation for proto_udpHans Schillstrom2011-01-132-43/+46
| | * | IPVS: netns preparation for proto_tcpHans Schillstrom2011-01-133-48/+70
| | * | IPVS: netns, prepare protocolHans Schillstrom2011-01-131-0/+66
| | * | IPVS: netns awarness to lblc shedulerHans Schillstrom2011-01-131-16/+34
| | * | IPVS: netns awarness to lblcr shedulerHans Schillstrom2011-01-131-18/+36
| | * | IPVS: netns to services part 1Hans Schillstrom2011-01-137-110/+147
| | * | IPVS: netns, add basic init per netns.Hans Schillstrom2011-01-1310-33/+316
| | * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Simon Horman2011-01-13343-6427/+19039
| | |\ \
| * | | | netfilter: fix Kconfig dependenciesPatrick McHardy2011-01-149-34/+33
| |/ / /
| * | | netfilter: fix compilation when conntrack is disabled but tproxy is enabledKOVACS Krisztian2010-12-152-1/+9
| * | | IPVS: Backup, adding version 0 sending capabilitiesHans Schillstrom2010-11-252-1/+161
| * | | IPVS: Backup, Change sending to Version 1 formatHans Schillstrom2010-11-252-47/+155
OpenPOWER on IntegriCloud