summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-06-1215-507/+1237
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-06-053-20/+62
| |\
| | * netfilter: nf_tables: atomic allocation in set notifications from rcu callbackPablo Neira Ayuso2014-06-021-6/+6
| | * netfilter: nf_tables: allow to delete several objects from a batchPablo Neira Ayuso2014-06-021-9/+31
| | * netfilter: nft_rbtree: introduce lockingPablo Neira Ayuso2014-06-021-1/+21
| | * netfilter: nf_tables: release objects in reverse order in the abort pathPablo Neira Ayuso2014-06-021-1/+2
| | * netfilter: nf_tables: fix wrong transaction ordering in set elementsPablo Neira Ayuso2014-06-021-2/+2
| | * netfilter: nfnetlink_acct: Fix memory leakMathieu Poirier2014-06-021-1/+0
| * | net: use the new API kvfree()WANG Cong2014-06-053-12/+3
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-06-031-5/+10
| |\ \
| * | | inetpeer: get rid of ip_id_countEric Dumazet2014-06-021-1/+1
| | |/ | |/|
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-05-304-10/+106
| |\ \
| | * | netfilter: add helper for adding nat extensionFlorian Westphal2014-04-291-8/+16
| | * | netfilter: nfnetlink_acct: Adding quota support to accounting frameworkMathieu Poirier2014-04-292-1/+89
| | * | netfilter: Fix format string mismatch in ip_vs_proto_name()Masanari Iida2014-04-231-1/+1
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-05-241-26/+23
| |\ \ \
| * | | | net: filter: let unattached filters use sock_fprog_kernDaniel Borkmann2014-05-231-2/+3
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftablesDavid S. Miller2014-05-226-459/+1061
| |\ \ \ \
| | * | | | netfilter: nf_tables: defer all object release via rcuPablo Neira Ayuso2014-05-191-39/+54
| | * | | | netfilter: nf_tables: remove skb and nlh from context structurePablo Neira Ayuso2014-05-191-55/+46
| | * | | | netfilter: nf_tables: simplify nf_tables_*_notifyPablo Neira Ayuso2014-05-191-58/+32
| | * | | | netfilter: nf_tables: use new transaction infrastructure to handle elementsPablo Neira Ayuso2014-05-191-14/+68
| | * | | | netfilter: nf_tables: use new transaction infrastructure to handle tablePablo Neira Ayuso2014-05-191-19/+126
| | * | | | netfilter: nf_tables: pass context to nf_tables_updtable()Pablo Neira Ayuso2014-05-191-25/+26
| | * | | | netfilter: nf_tables: disabling table hooks always succeedsPablo Neira Ayuso2014-05-191-6/+3
| | * | | | netfilter: nf_tables: use new transaction infrastructure to handle chainPablo Neira Ayuso2014-05-191-45/+158
| | * | | | netfilter: nf_tables: refactor chain statistic routinesPablo Neira Ayuso2014-05-191-21/+24
| | * | | | netfilter: nf_tables: use new transaction infrastructure to handle setsPablo Neira Ayuso2014-05-192-18/+115
| | * | | | netfilter: nf_tables: add message type to transactionsPablo Neira Ayuso2014-05-191-31/+43
| | * | | | netfilter: nf_tables: relocate commit and abort routines in the source filePablo Neira Ayuso2014-05-191-80/+80
| | * | | | netfilter: nf_tables: generalise transaction infrastructurePablo Neira Ayuso2014-05-191-54/+69
| | * | | | netfilter: nf_tables: deconstify table and chain in context structurePablo Neira Ayuso2014-05-191-29/+29
| | * | | | netfilter: nf_tables: relax string validation of NFTA_CHAIN_TYPEPablo Neira2014-04-281-1/+1
| | * | | | netfilter: nf_tables: Make meta expression core functions publicTomasz Bursztyka2014-04-231-25/+25
| | * | | | netfilter: nf_tables: Stack expression type depending on their familyTomasz Bursztyka2014-04-231-1/+4
| | * | | | netfilter: nf_tables: handle more than 8 * PAGE_SIZE set name allocationsPatrick McHardy2014-04-141-5/+10
| | * | | | netfilter: nf_tables: add set_elem notificationsArturo Borrero2014-04-031-0/+82
| | * | | | netfilter: nft_hash: use set global element counter instead of private onePatrick McHardy2014-04-021-7/+2
| | * | | | netfilter: nf_tables: implement proper set selectionPatrick McHardy2014-04-023-18/+169
| | * | | | netfilter: nft_ct: split nft_ct_init() into two functions for get/setPatrick McHardy2014-04-021-53/+43
| | * | | | netfilter: nft_meta: split nft_meta_init() into two functions for get/setPatrick McHardy2014-04-021-35/+30
| | * | | | netfilter: nft_ct: add missing ifdef for NFT_MARK settingPatrick McHardy2014-04-021-0/+2
| * | | | | net: rename local_df to ignore_dfWANG Cong2014-05-121-10/+10
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-05-122-6/+8
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | netlink: have netlink per-protocol bind function return an error code.Richard Guy Briggs2014-04-221-1/+2
| * | | | | netlink: simplify nfnetlink_bindRichard Guy Briggs2014-04-221-5/+2
* | | | | | Merge tag 'llvmlinux-for-v3.16' of git://git.linuxfoundation.org/llvmlinux/ke...Linus Torvalds2014-06-081-5/+17
|\ \ \ \ \ \
| * | | | | | net: netfilter: LLVMLinux: vlais-netfilterMark Charlebois2014-06-071-5/+17
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'next' (accumulated 3.16 merge window patches) into masterLinus Torvalds2014-06-081-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2014-06-031-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |