summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-10-2158-1714/+3653
|\
| * Merge branch 'for-patrick' of git://git.kernel.org/pub/scm/linux/kernel/git/h...Patrick McHardy2010-10-2111-398/+918
| |\
| | * nf_nat: restrict ICMP translation for embedded headerJulian Anastasov2010-10-211-14/+15
| | * ipvs: provide address family for debuggingJulian Anastasov2010-10-217-84/+45
| | * ipvs: inherit forwarding method in backupJulian Anastasov2010-10-211-0/+2
| | * ipvs: changes for local clientJulian Anastasov2010-10-212-92/+225
| | * ipvs: changes for local real serverJulian Anastasov2010-10-213-117/+457
| | * ipvs: move ip_route_me_harder for ICMPJulian Anastasov2010-10-211-20/+21
| | * ipvs: create ip_vs_defrag_userJulian Anastasov2010-10-211-21/+34
| | * ipvs: fix CHECKSUM_PARTIAL for TUN methodJulian Anastasov2010-10-211-1/+1
| | * ipvs: stop ICMP from FORWARD to localJulian Anastasov2010-10-211-2/+19
| | * ipvs: do not schedule conns from real serversJulian Anastasov2010-10-214-8/+45
| | * ipvs: switch to notrack modeJulian Anastasov2010-10-212-37/+9
| | * ipvs: optimize checksums for appsJulian Anastasov2010-10-213-13/+56
| | * ipvs: fix CHECKSUM_PARTIAL for TCP, UDPJulian Anastasov2010-10-212-10/+10
| * | tproxy: use the interface primary IP address as a default value for --on-ipBalazs Scheidler2010-10-211-70/+132
| * | tproxy: added IPv6 support to the socket matchBalazs Scheidler2010-10-211-11/+154
| * | tproxy: added IPv6 support to the TPROXY targetBalazs Scheidler2010-10-211-37/+225
| * | tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabledBalazs Scheidler2010-10-211-1/+2
| * | tproxy: added tproxy sockopt interface in the IPV6 layerBalazs Scheidler2010-10-212-0/+42
| * | tproxy: added udp6_lib_lookup functionBalazs Scheidler2010-10-211-0/+8
| * | tproxy: added const specifiers to udp lookup functionsBalazs Scheidler2010-10-211-4/+4
| * | tproxy: split off ipv6 defragmentation to a separate moduleBalazs Scheidler2010-10-214-78/+150
| * | tproxy: fix hash locking issue when using port redirection in __inet_inherit_...Balazs Scheidler2010-10-215-15/+55
| * | tproxy: add lookup type checks for UDP in nf_tproxy_get_sock_v4()Balazs Scheidler2010-10-211-48/+0
| * | tproxy: kick out TIME_WAIT sockets in case a new connection comes in with the...Balazs Scheidler2010-10-213-14/+85
| |/
| * Fixed race condition at ip_vs.ko module init.Eduardo Blanco2010-10-191-9/+10
| * ipvs: IPv6 tunnel modeHans Schillstrom2010-10-191-79/+92
| * netfilter: ctnetlink: add expectation deletion eventsPablo Neira Ayuso2010-10-192-11/+25
| * netfilter: fix kconfig unmet dependency warningRandy Dunlap2010-10-182-4/+4
| * IPVS: ip_vs_dbg_callid() is only needed for debuggingSimon Horman2010-10-131-0/+2
| * netfilter: xtables: resolve indirect macros 3/3Jan Engelhardt2010-10-135-27/+27
| * netfilter: xtables: resolve indirect macros 2/3Jan Engelhardt2010-10-134-79/+79
| * netfilter: xtables: resolve indirect macros 1/3Jan Engelhardt2010-10-133-17/+17
| * netfilter: unregister nf hooks, matches and targets in the reverse orderChangli Gao2010-10-042-12/+6
| * netfilter: remove duplicated includeNicolas Kaiser2010-10-041-1/+0
| * netfilter: ipt_LOG: add bufferisation to call printk() onceEric Dumazet2010-10-042-150/+152
| * netfilter: nf_nat: make find/put staticStephen Hemminger2010-10-041-4/+2
| * IPVS: sip persistence engineSimon Horman2010-10-043-0/+177
| * IPVS: Fallback if persistence engine failsSimon Horman2010-10-042-9/+7
| * IPVS: Allow configuration of persistence enginesSimon Horman2010-10-041-3/+54
| * IPVS: management of persistence engine modulesSimon Horman2010-10-042-1/+148
| * IPVS: Add persistence engine data to /proc/net/ip_vs_connSimon Horman2010-10-041-5/+20
| * IPVS: Add struct ip_vs_peSimon Horman2010-10-043-20/+100
| * IPVS: ip_vs_{un,}bind_scheduler NULL argumentsSimon Horman2010-10-042-22/+4
| * IPVS: Allow null argument to ip_vs_scheduler_put()Simon Horman2010-10-042-10/+5
| * IPVS: Add struct ip_vs_conn_paramSimon Horman2010-10-046-189/+181
| * IPVS: compact ip_vs_sched_persist()Simon Horman2010-10-041-105/+51
| * netfilter: nf_conntrack_sip: Add callid parserSimon Horman2010-10-041-0/+39
| * netfilter: nf_conntrack_sip: Allow ct_sip_get_header() to be called with a nu...Simon Horman2010-10-041-0/+3