summaryrefslogtreecommitdiffstats
path: root/net/netfilter/ipvs
Commit message (Expand)AuthorAgeFilesLines
* netfilter: don't use mutex_lock_interruptible()Pablo Neira Ayuso2014-08-081-15/+4
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-08-051-1/+1
|\
| * ipvs: Maintain all DSCP and ECN bits for ipv6 tun forwardingAlex Gartrell2014-07-171-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-07-301-1/+0
|\ \ | |/
| * ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrackJulian Anastasov2014-07-161-1/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-07-202-88/+1
|\ \ | |/ |/|
| * ipvs: Remove dead debug codeYannick Brosseau2014-07-161-86/+0
| * ipvs: remove null test before kfreeFabian Frederick2014-07-161-2/+1
* | Merge branch 'ipvs'Pablo Neira Ayuso2014-06-161-1/+1
|\ \ | |/ |/|
| * ipvs: stop tot_stats estimator only under CONFIG_SYSCTLJulian Anastasov2014-06-131-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-06-031-5/+10
|\ \ | |/
| * ipvs: Fix panic due to non-linear skbPeter Christensen2014-05-261-5/+10
* | inetpeer: get rid of ip_id_countEric Dumazet2014-06-021-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-05-301-1/+1
|\ \
| * | netfilter: Fix format string mismatch in ip_vs_proto_name()Masanari Iida2014-04-231-1/+1
| |/
* | net: rename local_df to ignore_dfWANG Cong2014-05-121-10/+10
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2014-03-172-8/+7
|\
| * ipvs: Reduce checkpatch noise in ip_vs_lblc.cTingwei Liu2014-03-071-7/+6
| * sections, ipvs: Remove useless __read_mostly for ipvs genl_opsAndi Kleen2014-03-071-1/+1
* | net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irqEric W. Biederman2014-03-141-2/+2
|/
* ipvs: fix AF assignment in ip_vs_conn_new()Michal Kubecek2014-02-041-4/+4
* net: replace macros net_random and net_srandom with direct calls to prandomAruna-Hewapathirane2014-01-141-1/+1
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-01-061-0/+6
|\
| * ipvs: correct usage/allocation of seqadj ext in ipvsJesper Dangaard Brouer2013-12-271-0/+6
* | ipvs: Remove unused variable ret from sync_thread_master()Geert Uytterhoeven2013-12-271-1/+4
* | netfilter: Fix FSF address in file headersJeff Kirsher2013-12-061-2/+1
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2013-11-191-2/+2
|\
| * genetlink: only pass array to genl_register_family_with_ops()Johannes Berg2013-11-191-1/+1
| * genetlink: make all genl_ops users constJohannes Berg2013-11-141-1/+1
* | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2013-11-141-3/+22
|\ \ | |/ |/|
| * net: Explicitly initialize u64_stats_sync structures for lockdepJohn Stultz2013-11-061-3/+22
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-11-137-106/+94
|\ \ | |/ |/|
| * netfilter: push reasm skb through instead of original frag skbsJiri Pirko2013-11-112-61/+2
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-11-045-25/+72
| |\
| | * net: ipvs: sctp: do not recalc sctp csum when ports didn't changeDaniel Borkmann2013-10-301-6/+33
| | * net: ipvs: sctp: add missing verdict assignments in sctp_conn_scheduleDaniel Borkmann2013-10-281-2/+7
| | * ipvs: improved SH fallback strategyAlexander Frolkin2013-10-151-10/+29
| | * ipvs: avoid rcu_barrier during netns cleanupJulian Anastasov2013-10-153-7/+3
| * | netfilter: pass hook ops to hookfnPatrick McHardy2013-10-141-21/+21
| |/
* | Merge tag 'v3.12-rc4' into sched/coreIngo Molnar2013-10-099-141/+119
|\ \ | |/
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2013-10-018-140/+118
| |\
| | * ipvs: stats should not depend on CPU 0Julian Anastasov2013-09-181-1/+3
| | * ipvs: do not use dest after ip_vs_dest_put in LBLCRJulian Anastasov2013-09-181-30/+20
| | * ipvs: do not use dest after ip_vs_dest_put in LBLCJulian Anastasov2013-09-181-37/+31
| | * ipvs: make the service replacement more robustJulian Anastasov2013-09-182-53/+45
| | * ipvs: fix overflow on dest weight multiplySimon Kirby2013-09-185-19/+19
| * | ip: generate unique IP identificator if local fragmentation is allowedAnsis Atteka2013-09-191-1/+1
| |/
* | sched/wait: Make the __wait_event*() interface more friendlyPeter Zijlstra2013-10-041-5/+2
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-08-202-4/+10
|\
| * ipvs: ip_vs_sh: ip_vs_sh_get_port: check skb_header_pointer for NULLDaniel Borkmann2013-08-071-0/+6
OpenPOWER on IntegriCloud