summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2015-01-125-27/+30
|\
| * netfilter: nf_tables: fix flush ruleset chain dependenciesPablo Neira Ayuso2015-01-061-5/+9
| * netfilter: nfnetlink: relax strict multicast group check from netlink_bindPablo Neira Ayuso2015-01-061-1/+1
| * netfilter: nfnetlink: validate nfnetlink header from batchPablo Neira Ayuso2015-01-061-1/+2
| * netfilter: conntrack: fix race between confirmation and flushPablo Neira Ayuso2015-01-061-11/+9Star
| * netfilter: nf_tables: fix port natting in little endian archsleroy christophe2014-12-231-4/+4
| * Merge tag 'ipvs2-for-v3.19' of https://git.kernel.org/pub/scm/linux/kernel/gi...Pablo Neira Ayuso2014-12-181-5/+5
| |\
| | * ipvs: uninitialized data with IP_VS_IPV6Dan Carpenter2014-12-101-5/+5
* | | netlink/genetlink: pass network namespace to bind/unbindJohannes Berg2014-12-271-1/+1
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-12-1127-225/+502
|\|
| * dst: no need to take reference on DST_NOCACHE dstsHannes Frederic Sowa2014-12-091-2/+2
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-12-0611-85/+310
| |\
| | * netfilter: ipset: Explicitly add padding elements to hash:net, net and hash:n...Jozsef Kadlecsik2014-12-032-0/+4
| | * netfilter: ipset: Allocate the proper size of memory when /0 networks are sup...Jozsef Kadlecsik2014-12-031-2/+1Star
| | * netfilter: ipset: Simplify cidr handling for hash:*net* typesJozsef Kadlecsik2014-12-031-28/+28
| | * netfilter: ipset: Indicate when /0 networks are supportedJozsef Kadlecsik2014-12-032-1/+2
| | * netfilter: ipset: Alignment problem between 64bit kernel 32bit userspaceJozsef Kadlecsik2014-12-031-3/+70
| | * netfilter: ipset: Support updating extensions when the set is fullJozsef Kadlecsik2014-12-031-23/+17Star
| | * netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one modulePablo Neira Ayuso2014-11-274-4/+137
| | * netfilter: conntrack: avoid zeroing timerFlorian Westphal2014-11-271-7/+4Star
| | * netfilter: xt_recent: relax ip_pkt_list_tot restrictionsFlorian Westphal2014-11-271-17/+47
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-11-301-8/+6Star
| |\ \ | | |/ | |/|
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-11-2418-139/+187
| |\ \
| | * | netfilter: nfnetlink_log: Make use of pr_fmt where applicableMarcelo Leitner2014-11-201-3/+6
| | * | netfilter: Deletion of unnecessary checks before two function callsMarkus Elfring2014-11-205-10/+5Star
| | * | netfilter: nf_conntrack_h323: lookup route from proper net namespaceVasily Averin2014-11-171-6/+8
| | * | netfilter: xt_connlimit: honor conntrack zone if availableFlorian Westphal2014-11-171-11/+14
| | * | netfilter: nfnetlink_log: remove unnecessary error messagesPablo Neira Ayuso2014-11-131-7/+2Star
| | * | netfilter: fix various sparse warningsFlorian Westphal2014-11-132-2/+5
| | * | netfilter: nft_redir: fix sparse warningsPablo Neira Ayuso2014-11-121-5/+6
| | * | netfilter: fix unmet dependencies in NETFILTER_XT_TARGET_REDIRECTPablo Neira Ayuso2014-11-121-2/+2
| | * | netfilter: nft_meta: add cgroup supportAna Rey2014-11-091-0/+7
| | * | netfilter: nf_log: fix sparse warning in nf_logger_find_get()Pablo Neira Ayuso2014-11-041-2/+1Star
| | * | netfilter: fix spelling errorsstephen hemminger2014-10-302-2/+2
| | * | Merge branch 'ipvs-next'Pablo Neira Ayuso2014-10-301-1/+0Star
| | |\ \
| | | * | ipvs: remove unnecessary assignment in __ip_vs_get_out_rtAlex Gartrell2014-10-281-1/+0Star
| | * | | netfilter: log: protect nf_log_register against double registeringMarcelo Leitner2014-10-301-3/+13
| | * | | netfilter: nf_log: Introduce nft_log_dereference() macroMarcelo Leitner2014-10-301-12/+9Star
| | * | | netfilter: nf_tables: add new expression nft_redirArturo Borrero2014-10-273-0/+108
| | * | | netfilter: refactor NAT redirect IPv6 code to use it from nf_tablesArturo Borrero2014-10-272-38/+3Star
| | * | | netfilter: refactor NAT redirect IPv4 to use it from nf_tablesArturo Borrero2014-10-272-42/+3Star
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-11-226-57/+41Star
| |\ \ \ \
| * | | | | rhashtable: Drop gfp_flags arg in insert/remove functionsThomas Graf2014-11-131-2/+2
| * | | | | rhashtable: Add parent argument to mutex_is_heldHerbert Xu2014-11-131-1/+1
| * | | | | netfilter: Move mutex_is_held under PROVE_LOCKINGHerbert Xu2014-11-131-0/+4
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2014-12-1113-132/+133
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'iov_iter' into for-nextAl Viro2014-12-0911-90/+184
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | netfilter: Remove checks of seq_printf() return valuesSteven Rostedt (Red Hat)2014-11-055-77/+81
| * | | | | netfilter: Convert print_tuple functions to return voidJoe Perches2014-11-059-44/+41Star
| * | | | | netfilter: Remove return values for print_conntrack callbacksSteven Rostedt (Red Hat)2014-11-055-12/+12
| | |_|_|/ | |/| | |