summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2011-01-071-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/+16
* | netfilter: allow hooks to pass error code back up the stackEric Paris2010-11-171-2/+4
* | ipv4: Make rt->fl.iif tests lest obscure.David S. Miller2010-11-111-3/+5
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-11-032-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/+3
|/
* 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/+45
| | | * | 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
| | | * | ipvs: fix CHECKSUM_PARTIAL for TUN methodJulian Anastasov2010-10-211-1/+1
| | | * | ipvs: stop ICMP from FORWARD to localJulian Anastasov2010-10-211-2/+19
| | | * | ipvs: do not schedule conns from real serversJulian Anastasov2010-10-214-8/+45
| | | * | ipvs: switch to notrack modeJulian Anastasov2010-10-212-37/+9
| | | * | ipvs: optimize checksums for appsJulian Anastasov2010-10-213-13/+56
| | | * | ipvs: fix CHECKSUM_PARTIAL for TCP, UDPJulian Anastasov2010-10-212-10/+10
| | * | | tproxy: use the interface primary IP address as a default value for --on-ipBalazs Scheidler2010-10-211-70/+132
| | * | | tproxy: added IPv6 support to the socket matchBalazs Scheidler2010-10-211-11/+154
| | * | | tproxy: added IPv6 support to the TPROXY targetBalazs Scheidler2010-10-211-37/+225
| | * | | tproxy: add lookup type checks for UDP in nf_tproxy_get_sock_v4()Balazs Scheidler2010-10-211-48/+0
| | * | | tproxy: kick out TIME_WAIT sockets in case a new connection comes in with the...Balazs Scheidler2010-10-213-14/+85
| | |/ /
| | * | Fixed race condition at ip_vs.ko module init.Eduardo Blanco2010-10-191-9/+10
| | * | ipvs: IPv6 tunnel modeHans Schillstrom2010-10-191-79/+92
| | * | netfilter: ctnetlink: add expectation deletion eventsPablo Neira Ayuso2010-10-192-11/+25
| | * | IPVS: ip_vs_dbg_callid() is only needed for debuggingSimon Horman2010-10-131-0/+2
| | * | netfilter: unregister nf hooks, matches and targets in the reverse orderChangli Gao2010-10-042-12/+6
| | * | netfilter: remove duplicated includeNicolas Kaiser2010-10-041-1/+0
| | * | IPVS: sip persistence engineSimon Horman2010-10-043-0/+177
| | * | IPVS: Fallback if persistence engine failsSimon Horman2010-10-042-9/+7
| | * | IPVS: Allow configuration of persistence enginesSimon Horman2010-10-041-3/+54
| | * | IPVS: management of persistence engine modulesSimon Horman2010-10-042-1/+148
| | * | IPVS: Add persistence engine data to /proc/net/ip_vs_connSimon Horman2010-10-041-5/+20
| | * | IPVS: Add struct ip_vs_peSimon Horman2010-10-043-20/+100
| | * | IPVS: ip_vs_{un,}bind_scheduler NULL argumentsSimon Horman2010-10-042-22/+4
| | * | IPVS: Allow null argument to ip_vs_scheduler_put()Simon Horman2010-10-042-10/+5