aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-10-241-1/+1
|\
| * Update broken web addresses in the kernel.Justin P. Mattock2010-10-181-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-10-2314-256/+325
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-10-2113-239/+309
| |\ \
| | * | nf_nat: restrict ICMP translation for embedded headerJulian Anastasov2010-10-211-14/+15
| | * | netfilter: fix kconfig unmet dependency warningRandy Dunlap2010-10-181-2/+2
| | * | netfilter: xtables: resolve indirect macros 3/3Jan Engelhardt2010-10-133-17/+17
| | * | netfilter: xtables: resolve indirect macros 2/3Jan Engelhardt2010-10-132-46/+46
| | * | netfilter: xtables: resolve indirect macros 1/3Jan Engelhardt2010-10-132-11/+11
| | * | netfilter: ipt_LOG: add bufferisation to call printk() onceEric Dumazet2010-10-041-72/+73
| | * | netfilter: nf_nat: make find/put staticStephen Hemminger2010-10-041-4/+2
| | * | netfilter: nf_nat: better error handling of nf_ct_expect_related() in helpersPablo Neira Ayuso2010-09-225-14/+93
| | * | netfilter: nf_nat: no IP_NAT_RANGE_MAP_IPS flags when alloc_null_binding()Changli Gao2010-09-161-9/+8
| | * | netfilter: nf_nat_core: don't check if the tuple is used if there is no other...Changli Gao2010-09-161-5/+11
| | * | netfilter: nf_nat: add nf_nat_csum()Changli Gao2010-09-151-45/+31
| * | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-09-273-3/+8
| |\ \ \
| * | | | net: return operator cleanupEric Dumazet2010-09-231-1/+1
| | |/ / | |/| |
| * | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-09-092-0/+6
| |\ \ \
| * \ \ \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-08-212-0/+4
| |\ \ \ \
| * | | | | netfilter: ipt_CLUSTERIP: use proto_ports_offset() to support AH messageChangli Gao2010-08-191-16/+15
| | |_|_|/ | |/| | |
* | | | | Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2010-10-211-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge commit 'v2.6.36-rc7' into core/rcuIngo Molnar2010-10-073-3/+8
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/pa...Ingo Molnar2010-10-072-0/+6
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | net/netfilter: __rcu annotationsArnd Bergmann2010-08-191-1/+1
| | |_|_|/ | |/| | |
* | | | | secmark: export secctx, drop secmark in procfsEric Paris2010-10-211-3/+25
| |_|/ / |/| | |
* | | | netfilter: nf_conntrack_defrag: check socket type before touching nodefrag flagJiri Olsa2010-09-221-1/+3
* | | | netfilter: nf_nat_snmp: fix checksum calculation (v4)Patrick McHardy2010-09-221-2/+4
* | | | netfilter: fix ipt_REJECT TCP RST routing for indev == outdevChangli Gao2010-09-221-0/+1
| |/ / |/| |
* | | netfilter: fix CONFIG_COMPAT supportFlorian Westphal2010-08-232-0/+6
|/ /
* / netfilter: {ip,ip6,arp}_tables: avoid lockdep false positiveEric Dumazet2010-08-172-0/+4
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-08-0213-70/+60
|\
| * netfilter: nf_nat: don't check if the tuple is unique when there isn't any ot...Changli Gao2010-08-023-6/+6
| * netfilter: nf_nat: make unique_tuple return voidChangli Gao2010-08-029-28/+26
| * netfilter: nf_nat: use local variable hdrlenChangli Gao2010-08-021-11/+7
| * netfilter: {ip,ip6,arp}_tables: dont block bottom half more than necessaryEric Dumazet2010-08-022-8/+12
| * netfilter: iptables: use skb->len for accountingChangli Gao2010-07-231-1/+1
| * netfilter: arptables: use arp_hdr_len()Changli Gao2010-07-231-4/+1
| * netfilter: nf_nat_core: merge the same linesChangli Gao2010-07-231-7/+2
| * netfilter: ipt_REJECT: avoid touching dst refEric Dumazet2010-07-051-1/+1
| * netfilter: ipt_REJECT: postpone the checksum calculation.Changli Gao2010-07-051-5/+5
* | net: remove last uses of __attribute__((packed))Gustavo F. Padovan2010-07-211-1/+1
* | net/ipv4: EXPORT_SYMBOL cleanupsEric Dumazet2010-07-121-1/+1
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-07-024-27/+51
|\
| * netfilter: ipt_LOG/ip6t_LOG: add option to print decoded MAC headerPatrick McHardy2010-06-281-14/+40
| * netfilter: ipt_LOG/ip6t_LOG: remove comparison within loopPatrick McHardy2010-06-281-6/+6
| * netfilter: nf_nat: support user-specified SNAT rules in LOCAL_INPatrick McHardy2010-06-173-13/+11
* | net - IP_NODEFRAG option for IPv4 socketJiri Olsa2010-06-231-0/+5
|/
* Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-06-151-1/+1
|\
| * netfilter: xtables: stackptr should be percpuEric Dumazet2010-05-311-1/+1
* | netfilter: CLUSTERIP: RCU conversionEric Dumazet2010-06-151-19/+29