summaryrefslogtreecommitdiff
path: root/include/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-02-051-0/+2
|\
| * netfilter: nf_tables: validate hooks in NAT expressionsPablo Neira Ayuso2015-01-191-0/+2
* | netfilter: conntrack: Remove nf_ct_conntrack_flush_reportKristian Evensen2015-01-081-2/+0
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-12-114-6/+49
|\
| * netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one modulePablo Neira Ayuso2014-11-273-17/+12
| * netfilter: nf_tables_bridge: export nft_reject_ip*hdr_validate functionsAlvaro Neira2014-11-271-0/+7
| * netfilter: conntrack: avoid zeroing timerFlorian Westphal2014-11-271-6/+9
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-11-243-0/+38
| |\
| | * netfilter: nf_tables: add new expression nft_redirArturo Borrero2014-10-271-0/+21
| | * netfilter: refactor NAT redirect IPv6 code to use it from nf_tablesArturo Borrero2014-10-271-0/+8
| | * netfilter: refactor NAT redirect IPv4 to use it from nf_tablesArturo Borrero2014-10-271-0/+9
* | | Merge branch 'iov_iter' into for-nextAl Viro2014-12-084-2/+26
|\ \ \ | |/ /
| * | netfilter: nf_tables: restore synchronous object release from commit/abortPablo Neira Ayuso2014-11-121-2/+0
| * | netfilter: nf_reject_ipv6: split nf_send_reset6() in smaller functionsPablo Neira Ayuso2014-10-311-0/+10
| * | netfilter: nf_reject_ipv4: split nf_send_reset() in smaller functionsPablo Neira Ayuso2014-10-311-0/+10
| |/
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2014-10-202-0/+6
| |\
| | * netfilter: nf_tables: restrict nat/masq expressions to nat chain typePablo Neira Ayuso2014-10-132-0/+6
* | | netfilter: Convert print_tuple functions to return voidJoe Perches2014-11-053-5/+5
* | | netfilter: Remove return values for print_conntrack callbacksSteven Rostedt (Red Hat)2014-11-051-1/+1
|/ /
* | Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2014-10-151-1/+1
|\ \ | |/ |/|
| * net: Replace get_cpu_var through this_cpu_ptrChristoph Lameter2014-08-261-1/+1
* | netfilter: kill nf_send_reset6() from include/net/netfilter/ipv6/nf_reject.hPablo Neira Ayuso2014-10-071-155/+2
* | netfilter: explicit module dependency between br_netfilter and physdevPablo Neira Ayuso2014-10-021-0/+6
* | netfilter: move nf_send_resetX() code to nf_reject_ipvX modulesPablo Neira Ayuso2014-10-021-117/+1
* | netfilter: nft_reject: introduce icmp code abstraction for inet and bridgePablo Neira Ayuso2014-10-022-7/+3
* | netfilter: nf_tables: store and dump set policyArturo Borrero2014-09-291-0/+2
* | netfilter: bridge: move br_netfilter out of the corePablo Neira Ayuso2014-09-262-2/+2
* | netfilter: fix compilation of masquerading without IP_NF_TARGET_MASQUERADEPablo Neira Ayuso2014-09-111-6/+4
* | netfilter: nf_tables: add new nft_masq expressionArturo Borrero2014-09-091-0/+16
* | netfilter: nf_nat: generalize IPv6 masquerading support for nf_tablesArturo Borrero2014-09-091-0/+10
* | netfilter: nf_nat: generalize IPv4 masquerading support for nf_tablesArturo Borrero2014-09-091-0/+14
* | netfilter: nat: move specific NAT IPv6 to corePablo Neira Ayuso2014-09-091-0/+37
* | netfilter: nat: move specific NAT IPv4 to corePablo Neira Ayuso2014-09-021-0/+38
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-07-221-2/+4
|\
| * netfilter: nf_tables: 64bit stats need some extra synchronizationEric Dumazet2014-07-141-2/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-07-203-62/+60
|\ \ | |/ |/|
| * netfilter: bridge: add generic packet loggerPablo Neira Ayuso2014-06-271-0/+1
| * netfilter: log: nf_log_packet() as real unified interfacePablo Neira Ayuso2014-06-271-14/+6
| * netfilter: log: split family specific code to nf_log_{ip,ip6,common}.c filesPablo Neira Ayuso2014-06-271-0/+28
| * netfilter: nf_log: move log buffering to core loggingPablo Neira Ayuso2014-06-252-54/+6
| * netfilter: nf_log: use an array of loggers instead of listPablo Neira Ayuso2014-06-251-6/+9
| * netfilter: conntrack: remove timer from ecache extensionFlorian Westphal2014-06-251-2/+24
* | netfilter: nf_tables: use u32 for chain use counterPablo Neira Ayuso2014-06-161-3/+3
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-05-301-0/+2
|\
| * netfilter: add helper for adding nat extensionFlorian Westphal2014-04-291-0/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftablesDavid S. Miller2014-05-222-11/+155
|\ \ | |/ |/|
| * netfilter: nf_tables: defer all object release via rcuPablo Neira Ayuso2014-05-191-0/+2
| * netfilter: nf_tables: remove skb and nlh from context structurePablo Neira Ayuso2014-05-191-4/+6
| * netfilter: nf_tables: use new transaction infrastructure to handle elementsPablo Neira Ayuso2014-05-191-0/+10
| * netfilter: nf_tables: use new transaction infrastructure to handle tablePablo Neira Ayuso2014-05-191-0/+10