summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2008-11-2819-114/+289
|\
| * netfilter: fix warning in net/netfilter/nf_conntrack_ftp.cIngo Molnar2008-11-251-1/+1
| * netfilter: nf_conntrack_ftp: change "partial ..." message to pr_debug()Patrick McHardy2008-11-241-4/+2
| * netfilter: nf_conntrack_proto_sctp: avoid bogus warningPatrick McHardy2008-11-241-1/+1
| * netfilter: nf_conntrack_proto_gre: spread __exitAlexey Dobriyan2008-11-201-1/+1
| * netfilter: xt_recent: don't save proc dirsAlexey Dobriyan2008-11-201-11/+11
| * netfilter: nf_conntrack: fix warning and prototype mismatchPatrick McHardy2008-11-181-4/+4
| * netfilter: nfnetlink_log: fix warning and prototype mismatchPatrick McHardy2008-11-181-0/+1
| * netfilter: ctnetlink: deliver events for conntracks changed from userspacePablo Neira Ayuso2008-11-184-29/+141
| * netfilter: ctnetlink: helper modules load-on-demand supportPablo Neira Ayuso2008-11-183-37/+93
| * netfilter: nf_conntrack: connection tracking helper name persistent aliasesPablo Neira Ayuso2008-11-179-0/+9
| * netfilter: ctnetlink: get rid of module refcounting in ctnetlinkPablo Neira Ayuso2008-11-171-20/+18
| * netfilter: ctnetlink: use EOPNOTSUPP instead of EINVAL if the conntrack has n...Pablo Neira Ayuso2008-11-171-1/+1
| * netfilter: ctnetlink: use nf_conntrack_get instead of atomic_incPablo Neira Ayuso2008-11-171-1/+1
| * netfilter: xt_NFLOG: don't call nf_log_packet in NFLOG module.Eric Leblond2008-11-042-3/+5
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2008-11-262-5/+4
|\ \
| * | netfilter: ctnetlink: fix GFP_KERNEL allocation under spinlockPatrick McHardy2008-11-261-1/+1
| * | netfilter: ctnetlink: fix conntrack creation racePatrick McHardy2008-11-242-4/+3
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2008-11-111-1/+2
|\ \ \ | |/ /
| * | netfilter: payload_len is be16, add size of struct rather than size of pointerHarvey Harrison2008-11-101-1/+2
* | | ipvs: oldlen, newlen should be be16, not be32Harvey Harrison2008-11-062-8/+8
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2008-11-062-0/+8
|\ \ \ | |/ / | | / | |/ |/|
| * netfilter: netns ct: walk netns list under RTNLAlexey Dobriyan2008-11-052-0/+8
* | net: '&' reduxAlexey Dobriyan2008-11-0310-81/+81
* | IPVS: Remove supports_ipv6 scheduler flagJulius Volz2008-11-0311-48/+6
* | IPVS: Add IPv6 support to LBLC/LBLCR schedulersJulius Volz2008-11-032-61/+92
* | IPVS: Add IPv6 support to SH and DH schedulersJulius Volz2008-11-022-18/+42
* | net: replace NIPQUAD() in net/netfilter/Harvey Harrison2008-10-3116-108/+78
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2008-10-311-2/+2
|\ \ | |/
| * netfilter: nf_conntrack_proto_gre: switch to register_pernet_gen_subsys()Alexey Dobriyan2008-10-301-2/+2
* | net: replace %p6 with %pI6Harvey Harrison2008-10-2910-19/+19
* | netfilter: replace uses of NIP6_FMT with %p6Harvey Harrison2008-10-2810-64/+45
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-10-206-13/+14
|\
| * netfilter: replace old NF_ARP calls with NFPROTO_ARPJan Engelhardt2008-10-201-1/+1
| * netfilter: fix compilation error with NAT=nPablo Neira Ayuso2008-10-201-0/+2
| * netfilter: xt_recent: use proc_create_data()Alexey Dobriyan2008-10-201-6/+4
| * netfilter: xt_iprange: fix range inversion matchAlexey Dobriyan2008-10-201-4/+4
| * netfilter: ctnetlink: remove obsolete NAT dependency from KconfigPatrick McHardy2008-10-201-1/+0
| * ipvs: Update CONFIG_IP_VS_IPV6 description and help textJulius Volz2008-10-191-1/+3
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-10-172-2/+2
|\ \ | |/
| * net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)Johannes Berg2008-10-162-2/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6Linus Torvalds2008-10-161-1/+1
|\ \
| * | driver core: basic infrastructure for per-module dynamic debug messagesJason Baron2008-10-161-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-10-163-93/+77
|\ \ \ | | |/ | |/|
| * | netfilter: ctnetlink: remove bogus module dependency between ctnetlink and nf...Pablo Neira Ayuso2008-10-143-93/+77
| |/
* | fix random typosDanny ter Haar2008-10-161-1/+1
|/
* netfilter: remove unused #include <version.h>Huang Weiyi2008-10-121-1/+0
* ipvs: Add proper dependencies on IP_VS, and fix description header line.David S. Miller2008-10-111-2/+2
* Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2008-10-0827-0/+14242
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into l...Simon Horman2008-10-071-2/+4
| |\
OpenPOWER on IntegriCloud