summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Simon Horman2011-01-139-71/+57Star
|\
| * Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2011-01-081-1/+1
| |\
| | * workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_dela...Tejun Heo2010-12-151-1/+1
| * | netfilter: fix export secctx error handlingPablo Neira Ayuso2011-01-062-12/+15
| * | netfilter: fix the race when initializing nf_ct_expect_hash_rndChangli Gao2011-01-062-20/+20
| * | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-11-191-0/+1
| |\|
| | * netfilter: fix IP_VS dependenciesPatrick McHardy2010-11-181-0/+1
| * | net: use the macros defined for the members of flowiChangli Gao2010-11-173-36/+16Star
| * | netfilter: allow hooks to pass error code back up the stackEric Paris2010-11-171-2/+4
* | | IPVS: Backup, adding version 0 sending capabilitiesHans Schillstrom2010-11-252-1/+161
* | | IPVS: Backup, Change sending to Version 1 formatHans Schillstrom2010-11-252-47/+155
* | | IPVS: Backup, Adding Version 1 receive capabilityHans Schillstrom2010-11-252-123/+431
* | | IPVS: Backup, Adding structs for new sync formatHans Schillstrom2010-11-251-12/+142
* | | IPVS: Handle Scheduling errors.Hans Schillstrom2010-11-254-23/+64
* | | IPVS: skb defrag in L7 helpersHans Schillstrom2010-11-251-0/+3
* | | IPVS: Split ports[2] into src_port and dst_portHans Schillstrom2010-11-251-10/+11
* | | IPVS: Backup, Prepare for transferring firewall marks (fwmark) to the backup ...Hans Schillstrom2010-11-255-12/+14
* | | Merge branch 'for-patrick' of git://git.kernel.org/pub/scm/linux/kernel/git/h...Patrick McHardy2010-11-165-53/+50Star
|\ \ \
| * | | ipvs: allow transmit of GRO aggregated skbsSimon Horman2010-11-161-10/+15
| * | | ipvs: remove shadow rt variableEric Dumazet2010-11-161-1/+0Star
| * | | ipvs: add static and read_mostly attributesEric Dumazet2010-11-161-5/+5
| * | | IPVS: buffer argument to ip_vs_process_message() should not be constSimon Horman2010-11-161-1/+1
| * | | IPVS: Remove useless { } block from ip_vs_process_message()Simon Horman2010-11-161-13/+11Star
| * | | IPVS: Make the cp argument to ip_vs_sync_conn() staticSimon Horman2010-11-161-1/+1
| * | | IPVS: Only match pe_data created by the same peSimon Horman2010-11-161-1/+1
| * | | IPVS: Add persistence engine to connection entrySimon Horman2010-11-163-21/+16Star
* | | | netfilter: nf_conntrack: one less atomic op in nf_ct_expect_insert()Eric Dumazet2010-11-161-2/+2
|/ / /
* | | netfilter: rcu sparse cleanupsEric Dumazet2010-11-154-9/+26
* | | netfilter: add __rcu annotationsEric Dumazet2010-11-157-22/+47
* | | netfilter: xt_CLASSIFY: add ARP support, allow CLASSIFY target on any tableFrédéric Leroy2010-11-151-12/+24
* | | netfilter: ct_extend: fix the wrong alloc_sizeChangli Gao2010-11-151-3/+2Star
* | | netfilter: xt_NFQUEUE: remove modulo operationsChangli Gao2010-11-121-2/+4
* | | netfilter: nf_conntrack: don't always initialize ct->protoChangli Gao2010-11-125-12/+10Star
|/ /
* / ipv4: Make rt->fl.iif tests lest obscure.David S. Miller2010-11-121-3/+5
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-11-042-1/+8
|\
| * netfilter: fix nf_conntrack_l4proto_register()Eric Dumazet2010-10-291-0/+6
| * netfilter: nf_conntrack: allow nf_ct_alloc_hashtable() to get highmem pagesEric Dumazet2010-10-281-1/+2
* | netfilter: xt_socket: Make tproto signed in socket_mt6_v1().David S. Miller2010-10-281-4/+3Star
|/
* netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables ...KOVACS Krisztian2010-10-253-8/+16
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-10-241-2/+2
|\
| * Update broken web addresses in the kernel.Justin P. Mattock2010-10-181-2/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-10-2329-1288/+2993
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-10-2128-1248/+2953
| |\ \
| | * \ Merge branch 'for-patrick' of git://git.kernel.org/pub/scm/linux/kernel/git/h...Patrick McHardy2010-10-2110-384/+903
| | |\ \
| | | * | ipvs: provide address family for debuggingJulian Anastasov2010-10-217-84/+45Star
| | | * | ipvs: inherit forwarding method in backupJulian Anastasov2010-10-211-0/+2
| | | * | ipvs: changes for local clientJulian Anastasov2010-10-212-92/+225
| | | * | ipvs: changes for local real serverJulian Anastasov2010-10-213-117/+457
| | | * | ipvs: move ip_route_me_harder for ICMPJulian Anastasov2010-10-211-20/+21
| | | * | ipvs: create ip_vs_defrag_userJulian Anastasov2010-10-211-21/+34