summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-04-263-10/+30
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-04-193-10/+30
| |\
| | * netfilter: ipset: Fix the order of listing of setsJozsef Kadlecsik2011-04-191-8/+10
| | * netfilter: ipset: set match and SET target fixesJozsef Kadlecsik2011-04-131-2/+16
| | * netfilter: ipset: bitmap:ip,mac type requires "src" for MACJozsef Kadlecsik2011-04-131-0/+4
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-04-197-14/+22
|\ \ \
| * | | netfilter: ipset: SCTP, UDPLITE support addedJozsef Kadlecsik2011-04-135-5/+19
| * | | IPVS: combine consecutive #ifdef CONFIG_PROC_FS blocksSimon Horman2011-04-051-3/+0
| * | | netfilter: get rid of atomic ops in fast pathEric Dumazet2011-04-041-6/+3
* | | | netfilter: nf_conntrack_standalone: Fix set-but-unused variables.David S. Miller2011-04-171-1/+1
* | | | netfilter: nfnetlink_log: Fix set-but-unused variables.David S. Miller2011-04-171-2/+0
| |/ / |/| |
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-04-1112-106/+132
|\ \ \ | | |/ | |/|
| * | netfilter: xt_conntrack: fix inverted conntrack direction testFlorian Westphal2011-04-041-1/+1
| * | netfilter: xt_addrtype: replace rt6_lookup with nf_afinfo->routeFlorian Westphal2011-04-042-15/+28
| * | netfilter: af_info: add 'strict' parameter to limit lookup to .oifFlorian Westphal2011-04-042-5/+5
| * | netfilter: af_info: add network namespace parameter to route hookFlorian Westphal2011-04-042-5/+5
| * | IPVS: fix NULL ptr dereference in ip_vs_ctl.c ip_vs_genl_dump_daemons()Hans Schillstrom2011-04-041-1/+1
| * | netfilter: h323: bug in parsing of ASN1 SEQOF fieldDavid Sterba2011-04-041-1/+1
| * | netfilter: ipset: references are protected by rwlock instead of mutexJozsef Kadlecsik2011-04-045-53/+71
| * | netfilter: ipset: list:set timeout variant fixesJozsef Kadlecsik2011-04-041-29/+24
| |/
* / Fix common misspellingsLucas De Marchi2011-03-3110-17/+17
|/
* IPVS: Use global mutex in ip_vs_app.cSimon Horman2011-03-211-13/+10
* ipvs: fix a typo in __ip_vs_control_init()Eric Dumazet2011-03-211-1/+1
* netfilter: ipset: fix checking the type revision at create commandJozsef Kadlecsik2011-03-201-5/+17
* netfilter: ipset: fix address ranges at hash:*port* typesJozsef Kadlecsik2011-03-204-94/+38
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-03-161-9/+27
|\
| * netfilter ebtables: fix xt_AUDIT to work with ebtablesThomas Graf2011-03-161-9/+27
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-03-1515-249/+602
|\|
| * netfilter: xt_addrtype: ipv6 supportFlorian Westphal2011-03-152-2/+97
| * netfilter: ipt_addrtype: rename to xt_addrtypeFlorian Westphal2011-03-153-0/+146
| * netfilter: xt_connlimit: remove connlimit_rnd_initedChangli Gao2011-03-151-4/+7
| * netfilter: xt_connlimit: use hlist insteadChangli Gao2011-03-151-14/+14
| * netfilter: xt_connlimit: use kmalloc() instead of kzalloc()Changli Gao2011-03-151-1/+1
| * netfilter: xt_connlimit: fix daddr connlimit in SNAT scenarioChangli Gao2011-03-151-11/+9
| * IPVS: Add __ip_vs_control_{init,cleanup}_sysctl()Simon Horman2011-03-151-36/+62
| * IPVS: Conditionally define and use ip_vs_lblc{r}_tableSimon Horman2011-03-152-9/+20
| * IPVS: Minimise ip_vs_leave when CONFIG_SYSCTL is undefinedSimon Horman2011-03-151-2/+7
| * IPVS: Conditinally use sysctl_lblc{r}_expirationSimon Horman2011-03-152-9/+28
| * IPVS: Add expire_quiescent_template()Simon Horman2011-03-151-2/+11
| * IPVS: Add sysctl_expire_nodest_conn()Simon Horman2011-03-151-1/+7
| * IPVS: Add sysctl_sync_ver()Simon Horman2011-03-151-2/+2
| * IPVS: Add {sysctl_sync_threshold,period}()Simon Horman2011-03-153-9/+9
| * IPVS: Add sysctl_nat_icmp_send()Simon Horman2011-03-151-3/+8
| * IPVS: Add sysctl_snat_reroute()Simon Horman2011-03-151-4/+16
| * IPVS: Add ip_vs_route_me_harder()Simon Horman2011-03-151-26/+22
| * ipvs: rename estimator functionsJulian Anastasov2011-03-152-8/+8
| * ipvs: optimize rates readingJulian Anastasov2011-03-152-39/+25
| * ipvs: properly zero stats and ratesJulian Anastasov2011-03-152-43/+68
| * ipvs: reorganize tot_statsJulian Anastasov2011-03-153-26/+28
| * netfilter:ipvs: use kmemdupShan Wei2011-03-152-7/+5