summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-08-042-2/+2
|\
| * Merge branch 'master' into for-nextJiri Kosina2010-08-041-0/+4
| |\
| * \ Merge branch 'master' into for-nextJiri Kosina2010-06-164-24/+19
| |\ \
| * | | fix typos concerning "initiali[zs]e"Uwe Kleine-König2010-06-162-2/+2
* | | | netfilter: nf_conntrack_acct: use skb->len for accountingChangli Gao2010-08-021-2/+1
* | | | ipvs: provide default ip_vs_conn_{in,out}_get_protoSimon Horman2010-08-024-153/+51
* | | | ipvs: remove EXPERIMENTAL tagSimon Horman2010-08-021-1/+1
* | | | netfilter: nf_conntrack_extend: introduce __nf_ct_ext_exist()Changli Gao2010-08-021-10/+12
* | | | xt_quota: report initial quota value instead of current value to userspaceChangli Gao2010-07-231-2/+0
* | | | netfilter: xt_quota: use per-rule spin lockChangli Gao2010-07-231-5/+5
* | | | netfilter: add xt_cpu matchEric Dumazet2010-07-233-0/+73
* | | | IPVS: make FTP work with full NAT supportHannes Eder2010-07-234-57/+165
* | | | IPVS: make friends with nf_conntrackHannes Eder2010-07-233-37/+30
* | | | netfilter: xt_ipvs (netfilter matcher for IPVS)Hannes Eder2010-07-234-0/+201
* | | | netfilter: add CHECKSUM targetMichael S. Tsirkin2010-07-153-0/+87
* | | | netfilter: nf_ct_tcp: fix flow recovery with TCP window tracking enabledPablo Neira Ayuso2010-07-151-1/+9
* | | | netfilter: xt_TPROXY: the length of lines should be within 80Changli Gao2010-07-091-2/+4
* | | | ipvs: lvs sctp protocol handler is incorrectly invoked ip_vs_app_pkt_outXiaoyu Du2010-07-091-1/+1
* | | | ipvs: Kconfig cleanupMichal Marek2010-07-051-4/+1
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-07-027-47/+42
|\ \ \ \
| * | | | netfilter: complete the deprecation of CONFIG_NF_CT_ACCTTim Gardner2010-06-252-35/+1
| * | | | netfilter: xt_connbytes: Force CT accounting to be enabledTim Gardner2010-06-251-0/+10
| * | | | netfilter: fix simple typo in KConfig for netfiltert xt_TEEArnd Hannemann2010-06-221-1/+1
| * | | | netfilter: xt_IDLETIMER needs kdev_t.hRandy Dunlap2010-06-221-0/+1
| * | | | IPVS: one-packet schedulingNick Chalk2010-06-223-11/+29
* | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-06-231-0/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | ipvs: Add missing locking during connection table hashing and unhashingSven Wegener2010-06-091-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-06-1516-86/+444
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-06-158-73/+69
| |\ \ \
| * | | | netfilter: xtables: idletimer target implementationLuciano Coelho2010-06-153-0/+327
| * | | | netfilter: nfnetlink_log: RCU conversion, part 2Eric Dumazet2010-06-141-6/+12
| * | | | netfilter: nfnetlink_log: RCU conversionEric Dumazet2010-06-091-22/+27
| * | | | netfilter: nfnetlink_queue: some optimizationsEric Dumazet2010-06-091-19/+14
| * | | | netfilter: xt_sctp: use WORD_ROUND macro to calculate length of multiple of 4...Shan Wei2010-06-091-1/+2
| * | | | netfilter: nf_conntrack: per_cpu untrackingEric Dumazet2010-06-091-10/+26
| * | | | netfilter: nf_conntrack: IPS_UNTRACKED bitEric Dumazet2010-06-089-22/+30
| * | | | netfilter: xt_statistic: remove nth_lock spinlockEric Dumazet2010-06-011-10/+9
* | | | | tcp: unify tcp flag macrosChangli Gao2010-06-152-23/+13
* | | | | bridge: use rx_handler_data pointer to store net_bridge_port pointerJiri Pirko2010-06-152-4/+8
| |/ / / |/| | |
* | | | pkt_sched: gen_kill_estimator() rcu fixesEric Dumazet2010-06-111-1/+11
* | | | net-next: remove useless union keywordChangli Gao2010-06-105-54/+54
* | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-06-061-14/+3
|\ \ \ \ | | |/ / | |/| |
| * | | netfilter: xtables: stackptr should be percpuEric Dumazet2010-05-311-10/+3
| * | | netfilter: don't xt_jumpstack_alloc twice in xt_register_tableXiaotian Feng2010-05-311-4/+0
| |/ /
* | | net: CONFIG_NET_NS reductionEric Dumazet2010-06-021-6/+2
|/ /
* | xt_tee: use skb_dst_drop()Eric Dumazet2010-05-281-2/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-05-202-8/+14
|\ \ | |/ |/|
| * netfilter: nf_conntrack: fix a race in __nf_conntrack_confirm against nf_ct_g...Joerg Marx2010-05-201-0/+10
| * netfilter: nf_ct_sip: handle non-linear skbsPatrick McHardy2010-05-141-8/+4
* | net: add a noref bit on skb dstEric Dumazet2010-05-171-0/+2
OpenPOWER on IntegriCloud