summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* netfilter: ctnetlink: fix timeout calculationXi Wang2011-12-311-2/+2
* ipvs: try also real server with port 0 in backup serverJulian Anastasov2011-12-313-4/+10
* Merge branch 'nf' of git://1984.lsi.us.es/netDavid S. Miller2011-12-241-5/+13
|\
| * netfilter: ctnetlink: fix scheduling while atomic if helper is autoloadedPablo Neira Ayuso2011-12-241-0/+3
| * netfilter: ctnetlink: fix return value of ctnetlink_get_expect()Pablo Neira Ayuso2011-12-241-5/+10
* | netfilter: xt_connbytes: handle negation correctlyFlorian Westphal2011-12-231-3/+3
|/
* netfilter: Remove ADVANCED dependency from NF_CONNTRACK_NETBIOS_NSDavid S. Miller2011-12-011-1/+0
* Merge branch 'nf' of git://1984.lsi.us.es/netDavid S. Miller2011-11-295-43/+73
|\
| * netfilter: nf_conntrack: make event callback registration per-netnsPablo Neira Ayuso2011-11-222-40/+70
| * netfilter: ipset: suppress compile-time warnings in ip_set_hash_ipport*.cJozsef Kadlecsik2011-11-213-3/+3
* | netfilter: Remove NOTRACK/RAW dependency on NETFILTER_ADVANCED.David S. Miller2011-11-231-1/+0
|/
* Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-068-0/+9
|\
| * net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modulesPaul Gortmaker2011-10-315-0/+5
| * net: add moduleparam.h for users of module_param/MODULE_PARM_DESCPaul Gortmaker2011-10-311-0/+1
| * net: Fix files explicitly needing to include module.hPaul Gortmaker2011-10-313-0/+3
* | netfilter: do not propagate nf_queue errors in nf_hook_slowFlorian Westphal2011-11-011-6/+5
* | ipvs: Remove unused variable "cs" from ip_vs_leave function.Krzysztof Wilczynski2011-11-011-1/+1
* | netfilter: Remove unnecessary OOM logging messagesJoe Perches2011-11-0113-60/+28
* | ipvs: Removed unused variablesSimon Horman2011-11-011-4/+0
* | ipvs: Remove unused return value of protocol state transitionsSimon Horman2011-11-014-24/+14
* | ipvs: Remove unused parameter from ip_vs_confirm_conntrack()Simon Horman2011-11-012-2/+2
* | ipvs: Expose ip_vs_ftp module parameters via sysfs.Krzysztof Wilczynski2011-11-011-2/+3
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2011-10-259-31/+31
|\
| * Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-10-243-53/+88
| |\
| * \ Merge branch 'master' of github.com:davem330/netDavid S. Miller2011-10-071-1/+1
| |\ \
| * \ \ Merge branch 'master' of github.com:davem330/netDavid S. Miller2011-09-224-10/+10
| |\ \ \
| * \ \ \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-08-071-0/+1
| |\ \ \ \
| * | | | | rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTERStephen Hemminger2011-08-029-31/+31
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-10-252-4/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | doc: fix broken referencesPaul Bolle2011-09-271-1/+1
| * | | | | Merge branch 'master' into for-nextJiri Kosina2011-09-154-2/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | net: Convert vmalloc/memset to vzallocJoe Perches2011-09-151-3/+2
* | | | | | Merge branch 'nf' of git://1984.lsi.us.es/netDavid S. Miller2011-10-173-53/+88
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | IPVS netns shutdown/startup dead-lockHans Schillstrom2011-10-122-51/+86
| * | | | | netfilter: nf_conntrack: fix event flooding in GRE protocol trackerFlorian Westphal2011-10-031-2/+2
| | |_|_|/ | |/| | |
* / | | | netfilter: Use proper rwlock init functionThomas Gleixner2011-10-051-1/+1
|/ / / /
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-08-304-10/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | netfilter: nf_ct_tcp: wrong multiplication of TCPOLEN_TSTAMP_ALIGNED in tcp_s...Jozsef Kadlecsik2011-08-301-1/+1
| * | | netfilter: nf_ct_tcp: fix incorrect handling of invalid TCP optionJozsef Kadlecsik2011-08-301-2/+2
| * | | netfilter: nf_ct_pptp: fix DNATed PPTP connection address translationSanket Shah2011-08-301-0/+1
| * | | netfilter: nf_queue: reject NF_STOLEN verdicts from userspaceFlorian Westphal2011-08-301-2/+2
| * | | netfilter: xt_rateest: fix xt_rateest_mt_checkentry()Eric Dumazet2011-07-291-5/+4
* | | | netfilter: avoid double free in nf_reinjectJulian Anastasov2011-08-071-0/+1
| |_|/ |/| |
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/...David S. Miller2011-07-281-0/+1
|\ \ \ | |/ / |/| |
| * | IPVS: Free resources on module removalSimon Horman2011-07-221-0/+1
* | | atomic: use <linux/atomic.h>Arun Sharma2011-07-262-2/+2
| |/ |/|
* | Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-07-221-7/+1
|\ \
| * | net,rcu: Convert call_rcu(xt_rateest_free_rcu) to kfree_rcu()Paul E. McKenney2011-07-201-7/+1
| |/
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-07-2110-76/+215
|\ \
| * | netfilter: ipset: hash:net,iface fixed to handle overlapping nets behind diff...Jozsef Kadlecsik2011-07-217-20/+56