summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-02-0225-31/+8321
|\
| * netfilter: xtables: add device group matchPatrick McHardy2011-02-033-0/+92
| * netfilter: ipset: send error message manuallyJozsef Kadlecsik2011-02-021-7/+26
| * netfilter: ipset: fix linking with CONFIG_IPV6=nPatrick McHardy2011-02-021-6/+9
| * netfilter: ipset: add missing break statemtns in ip_set_get_ip_port()Patrick McHardy2011-02-021-0/+2
| * IPVS: Remove ip_vs_sync_cleanup from section __exitSimon Horman2011-02-011-1/+1
| * IPVS: Allow compilation with CONFIG_SYSCTL disabledSimon Horman2011-02-013-25/+29
| * IPVS: remove duplicate initialisation or rs_tableSimon Horman2011-02-011-3/+0
| * IPVS: use z modifier for sizeof() argumentSimon Horman2011-02-011-1/+1
| * netfilter: ctnetlink: fix ctnetlink_parse_tuple() warningPatrick McHardy2011-02-011-1/+1
| * netfilter: ipset: remove unnecessary includesPatrick McHardy2011-02-019-27/+0
| * netfilter: ipset: use nla_parse_nested()Patrick McHardy2011-02-011-26/+16
| * netfilter: xtables: "set" match and "SET" target supportJozsef Kadlecsik2011-02-013-0/+372
| * netfilter: ipset: list:set set type supportJozsef Kadlecsik2011-02-013-0/+597
| * netfilter: ipset: hash:net,port set type supportJozsef Kadlecsik2011-02-013-0/+592
| * netfilter: ipset: hash:net set type supportJozsef Kadlecsik2011-02-013-0/+471
| * netfilter: ipset: hash:ip,port,net set type supportJozsef Kadlecsik2011-02-013-0/+642
| * netfilter: ipset: hash:ip,port,ip set type supportJozsef Kadlecsik2011-02-013-0/+576
| * netfilter: ipset: hash:ip,port set type supportJozsef Kadlecsik2011-02-013-0/+557
| * netfilter: ipset: hash:ip set type supportJozsef Kadlecsik2011-02-013-0/+480
| * netfilter: ipset; bitmap:port set type supportJozsef Kadlecsik2011-02-013-0/+530
| * netfilter: ipset: bitmap:ip,mac type supportJozsef Kadlecsik2011-02-013-0/+665
| * netfilter: ipset: bitmap:ip set type supportJozsef Kadlecsik2011-02-013-0/+600
| * netfilter: ipset: IP set core supportJozsef Kadlecsik2011-02-017-0/+2128
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-01-316-13/+35
|\|
| * netfilter: xt_iprange: add IPv6 match debug print codeThomas Jacob2011-01-281-2/+14
| * netfilter: xt_iprange: typo in IPv4 match debug print codeThomas Jacob2011-01-271-1/+1
| * Merge branch 'connlimit' of git://dev.medozas.de/linuxPatrick McHardy2011-01-261-4/+8
| |\
| | * netfilter: xt_connlimit: pick right dstaddr in NAT scenarioJan Engelhardt2011-01-261-4/+8
| * | netfilter: ipvs: fix compiler warningsChangli Gao2011-01-251-3/+1
| * | IPVS netns BUG, register sysctl for root nsHans Schillstrom2011-01-251-1/+1
| |/
| * IPVS: Change sock_create_kernel() to __sock_create()Simon Horman2011-01-221-2/+2
| * netfilter: ipvs: fix compiler warningsChangli Gao2011-01-222-0/+8
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-01-241-2/+2
|\ \ | |/ |/|
| * Revert "netlink: test for all flags of the NLM_F_DUMP composite"David S. Miller2011-01-191-2/+2
* | Merge branch 'connlimit' of git://dev.medozas.de/linuxPatrick McHardy2011-01-201-14/+30
|\ \
| * | netfilter: xtables: connlimit revision 1Jan Engelhardt2011-01-191-14/+30
* | | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2011-01-192-13/+11
|\ \ \ | | |/ | |/|
| * | netfilter: ctnetlink: fix loop in ctnetlink_get_conntrack()Pablo Neira Ayuso2011-01-131-1/+2
| * | netfilter: fix race in conntrack between dump_table and destroyStephen Hemminger2011-01-111-9/+5
| * | netfilter: x_tables: dont block BH while reading countersEric Dumazet2011-01-101-1/+2
| * | netlink: test for all flags of the NLM_F_DUMP compositeJan Engelhardt2011-01-091-2/+2
* | | 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-185-65/+189
* | 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