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. Miller2011-07-2110-76/+215
|\
| * netfilter: ipset: hash:net,iface fixed to handle overlapping nets behind diff...Jozsef Kadlecsik2011-07-217-20/+56
| * netfilter: nfnetlink_queue: batch verdict supportFlorian Westphal2011-07-191-12/+103
| * netfilter: nfnetlink_queue: assert monotonic packet idsEric Dumazet2011-07-191-11/+15
| * netfilter: nfnetlink_queue: provide rcu enabled callbacksEric Dumazet2011-07-181-29/+12
| * netfilter: nfnetlink: add RCU in nfnetlink_rcv_msg()Eric Dumazet2011-07-181-10/+30
| * netfilter: add SELinux context support to AUDIT targetMr Dash Four2011-06-301-0/+5
* | netfilter: Reduce switch/case indentJoe Perches2011-07-012-48/+48
* | ip: introduce ip_is_fragment helper inline functionPaul Gortmaker2011-06-211-4/+3
* | Remove redundant linux/version.h includes from net/Jesper Juhl2011-06-212-2/+0
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-06-2012-28/+38
|\ \ | |/ |/|
| * netfilter: fix looped (broad|multi)cast's MAC handlingNicolas Cavallari2011-06-162-2/+4
| * IPVS netns exit causes crash in conntrackHans Schillstrom2011-06-132-1/+10
| * netfilter: nf_conntrack: fix ct refcount leak in l4proto->error()Pablo Neira Ayuso2011-06-061-0/+3
| * netfilter: ipset: Use the stored first cidr value instead of '1'Jozsef Kadlecsik2011-06-063-8/+16
| * netfilter: ipset: Fix return code for destroy when sets are in useJozsef Kadlecsik2011-06-061-1/+1
| * ipvs: restore support for iptables SNATJulian Anastasov2011-06-061-8/+8
| * netfilter: add more values to enum ip_conntrack_infoEric Dumazet2011-06-068-17/+13
* | netfilter: ipset: whitespace and coding fixes detected by checkpatch.plJozsef Kadlecsik2011-06-167-21/+22
* | netfilter: ipset: hash:net,iface type introducedJozsef Kadlecsik2011-06-163-0/+773
* | netfilter: ipset: use the stored first cidr value instead of '1'Jozsef Kadlecsik2011-06-163-8/+16
* | netfilter: ipset: fix return code for destroy when sets are in useJozsef Kadlecsik2011-06-161-1/+1
* | netfilter: ipset: add xt_action_param to the variant level kadt functions, ip...Jozsef Kadlecsik2011-06-1612-16/+37
* | netfilter: ipset: use unified from/to address masking and check the usageJozsef Kadlecsik2011-06-167-17/+9
* | netfilter: ipset: take into account cidr value for the from address when crea...Jozsef Kadlecsik2011-06-161-0/+1
* | netfilter: ipset: support range for IPv4 at adding/deleting elements for hash...Jozsef Kadlecsik2011-06-164-54/+156
* | netfilter: ipset: set type support with multiple revisions addedJozsef Kadlecsik2011-06-1611-30/+45
* | netfilter: ipset: fix adding ranges to hash typesJozsef Kadlecsik2011-06-1611-30/+137
* | netfilter: ipset: support listing setnames and headers tooJozsef Kadlecsik2011-06-161-27/+46
* | netfilter: ipset: options and flags support added to the kernel APIJozsef Kadlecsik2011-06-1612-126/+176
* | netfilter: ipset: whitespace fixes: some space before tab slipped inJozsef Kadlecsik2011-06-161-2/+2
* | netfilter: ipset: timeout can be modified for already added elementsJozsef Kadlecsik2011-06-1610-93/+126
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/...Patrick McHardy2011-06-168-112/+87
|\ \
| * | IPVS: remove unused init and cleanup functions.Hans Schillstrom2011-06-144-53/+4
| * | IPVS: labels at pos 0Hans Schillstrom2011-06-142-9/+9
| * | IPVS: rename of netns init and cleanup functions.Hans Schillstrom2011-06-137-38/+38
| * | ipvs: support more FTP PASV responsesJulian Anastasov2011-06-131-14/+38
* | | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2011-06-1620-211/+389
|\| |
| * | rtnetlink: Compute and store minimum ifinfo dump sizeGreg Rose2011-06-092-3/+3
| |/
| * IPVS: bug in ip_vs_ftp, same list heaad used in all netns.Hans Schillstrom2011-05-271-8/+19
| * netfilter: ipset: fix ip_set_flush return codeJozsef Kadlecsik2011-05-261-1/+1
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-05-231-1/+1
| |\
| | * Merge branch 'master' into for-nextJiri Kosina2011-04-2627-246/+245
| | |\
| | * | treewide: remove extra semicolonsJustin P. Mattock2011-04-101-1/+1
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-2012-76/+101
| |\ \ \
| | * \ \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-05-174-10/+18
| | |\ \ \
| | | * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-05-171-4/+12
| | | |\ \ \
| | | | * | | netfilter: nf_ct_sip: fix SDP parsing in TCP SIP messages for some Cisco phonesPatrick McHardy2011-05-161-4/+10
| | | | * | | netfilter: nf_ct_sip: validate Content-Length in TCP SIP messagesPatrick McHardy2011-05-161-0/+2
| | | | * | | IPVS: init and cleanup restructuringHans Schillstrom2011-05-097-80/+206