]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Tue, 22 Dec 2015 19:54:13 +0000 (14:54 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Dec 2015 19:54:13 +0000 (14:54 -0500)
commite69d00b23062c8c8ce83219d40cc046c5dfaf945
tree894434b0b5d9ca56c1a39a994ffd6f9a1a20119a
parent52b60d7ba2e8abee9f9b5d22841ac1832b9c022c
parent360e067b3349eae706f126f44be9e02215e40e82
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains two netfilter fixes:

1) Oneliner from Florian to dump missing NFT_CT_L3PROTOCOL netlink
   attribute, from Florian Westphal.

2) Another oneliner for nf_tables to use skb->protocol from the new
   netdev family, we can't assume ethernet there.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>