aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAge
* Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2010-10-21
|\
| * Merge commit 'v2.6.36-rc7' into core/rcuIngo Molnar2010-10-07
| |\
| * \ Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/pa...Ingo Molnar2010-10-07
| |\ \
| * | | net/netfilter: __rcu annotationsArnd Bergmann2010-08-19
* | | | secmark: fix config problem when CONFIG_NF_CONNTRACK_SECMARK is not setEric Paris2010-10-20
* | | | secmark: export secctx, drop secmark in procfsEric Paris2010-10-20
* | | | conntrack: export lsm context rather than internal secid via netlinkEric Paris2010-10-20
* | | | secmark: make secmark object handling genericEric Paris2010-10-20
* | | | secmark: do not return early if there was no errorEric Paris2010-10-20
| |_|/ |/| |
* | | netfilter: fix a race in nf_ct_ext_create()Eric Dumazet2010-09-22
* | | netfilter: nf_ct_sip: default to NF_ACCEPT in sip_help_tcp()Simon Horman2010-09-22
* | | netfilter: tproxy: nf_tproxy_assign_sock() can handle tw socketsEric Dumazet2010-09-22
* | | ipvs: fix active FTPJulian Anastasov2010-09-08
| |/ |/|
* | ipvs: avoid oops for passive FTPJulian Anastasov2010-09-02
|/
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-08-04
|\
| * Merge branch 'master' into for-nextJiri Kosina2010-08-04
| |\
| * \ Merge branch 'master' into for-nextJiri Kosina2010-06-16
| |\ \
| * | | fix typos concerning "initiali[zs]e"Uwe Kleine-König2010-06-16
* | | | netfilter: nf_conntrack_acct: use skb->len for accountingChangli Gao2010-08-02
* | | | ipvs: provide default ip_vs_conn_{in,out}_get_protoSimon Horman2010-08-02
* | | | ipvs: remove EXPERIMENTAL tagSimon Horman2010-08-02
* | | | netfilter: nf_conntrack_extend: introduce __nf_ct_ext_exist()Changli Gao2010-08-02
* | | | xt_quota: report initial quota value instead of current value to userspaceChangli Gao2010-07-23
* | | | netfilter: xt_quota: use per-rule spin lockChangli Gao2010-07-23
* | | | netfilter: add xt_cpu matchEric Dumazet2010-07-23
* | | | IPVS: make FTP work with full NAT supportHannes Eder2010-07-23
* | | | IPVS: make friends with nf_conntrackHannes Eder2010-07-23
* | | | netfilter: xt_ipvs (netfilter matcher for IPVS)Hannes Eder2010-07-23
* | | | netfilter: add CHECKSUM targetMichael S. Tsirkin2010-07-15
* | | | netfilter: nf_ct_tcp: fix flow recovery with TCP window tracking enabledPablo Neira Ayuso2010-07-15
* | | | netfilter: xt_TPROXY: the length of lines should be within 80Changli Gao2010-07-09
* | | | ipvs: lvs sctp protocol handler is incorrectly invoked ip_vs_app_pkt_outXiaoyu Du2010-07-09
* | | | ipvs: Kconfig cleanupMichal Marek2010-07-05
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-07-03
|\ \ \ \
| * | | | netfilter: complete the deprecation of CONFIG_NF_CT_ACCTTim Gardner2010-06-25
| * | | | netfilter: xt_connbytes: Force CT accounting to be enabledTim Gardner2010-06-25
| * | | | netfilter: fix simple typo in KConfig for netfiltert xt_TEEArnd Hannemann2010-06-22
| * | | | netfilter: xt_IDLETIMER needs kdev_t.hRandy Dunlap2010-06-22
| * | | | IPVS: one-packet schedulingNick Chalk2010-06-22
* | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-06-23
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | ipvs: Add missing locking during connection table hashing and unhashingSven Wegener2010-06-09
| | |_|/ | |/| |
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-06-15
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-06-15
| |\ \ \
| * | | | netfilter: xtables: idletimer target implementationLuciano Coelho2010-06-15
| * | | | netfilter: nfnetlink_log: RCU conversion, part 2Eric Dumazet2010-06-14
| * | | | netfilter: nfnetlink_log: RCU conversionEric Dumazet2010-06-09
| * | | | netfilter: nfnetlink_queue: some optimizationsEric Dumazet2010-06-09
| * | | | netfilter: xt_sctp: use WORD_ROUND macro to calculate length of multiple of 4...Shan Wei2010-06-09
| * | | | netfilter: nf_conntrack: per_cpu untrackingEric Dumazet2010-06-09
| * | | | netfilter: nf_conntrack: IPS_UNTRACKED bitEric Dumazet2010-06-08