David S. Miller 9aa28f2b71 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables
Pablo Neira Ayuso says: <pablo@netfilter.org>

====================
nftables updates for net-next

The following patchset contains nftables updates for your net-next tree,
they are:

* Add set operation to the meta expression by means of the select_ops()
  infrastructure, this allows us to set the packet mark among other things.
  From Arturo Borrero Gonzalez.

* Fix wrong format in sscanf in nf_tables_set_alloc_name(), from Daniel
  Borkmann.

* Add new queue expression to nf_tables. These comes with two previous patches
  to prepare this new feature, one to add mask in nf_tables_core to
  evaluate the queue verdict appropriately and another to refactor common
  code with xt_NFQUEUE, from Eric Leblond.

* Do not hide nftables from Kconfig if nfnetlink is not enabled, also from
  Eric Leblond.

* Add the reject expression to nf_tables, this adds the missing TCP RST
  support. It comes with an initial patch to refactor common code with
  xt_NFQUEUE, again from Eric Leblond.

* Remove an unused variable assignment in nf_tables_dump_set(), from Michal
  Nazarewicz.

* Remove the nft_meta_target code, now that Arturo added the set operation
  to the meta expression, from me.

* Add help information for nf_tables to Kconfig, also from me.

* Allow to dump all sets by specifying NFPROTO_UNSPEC, similar feature is
  available to other nf_tables objects, requested by Arturo, from me.

* Expose the table usage counter, so we can know how many chains are using
  this table without dumping the list of chains, from Tomasz Bursztyka.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-06 13:29:30 -05:00
..
2013-12-06 07:24:39 +01:00
2013-10-19 19:36:19 -04:00
2013-10-17 15:02:02 -04:00
2013-12-29 16:34:25 -05:00
2013-10-08 23:19:24 -04:00
2013-12-28 17:03:20 -05:00
2012-10-08 17:42:36 -04:00
2013-12-10 21:57:11 -05:00
2013-10-19 19:36:19 -04:00
2013-09-03 21:41:43 -04:00
2013-12-28 17:05:45 -05:00
2014-01-02 03:30:36 -05:00
2013-12-06 07:24:39 +01:00
2013-12-29 16:34:24 -05:00
2013-12-29 16:34:24 -05:00
2013-03-21 11:47:50 -04:00
2012-03-11 23:42:51 -07:00
2013-10-19 19:36:19 -04:00
2013-05-31 17:19:05 -07:00