Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7c09ae6 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 987aaad9 d5f79b6e

net/netfilter/nf_tables_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ nft_do_chain_netdev(void *priv, struct sk_buff *skb, 
{

	struct nft_pktinfo pkt;



	switch (eth_hdr(skb)->h_proto) {

	switch (skb->protocol) {

	case htons(ETH_P_IP):

		nft_netdev_set_pktinfo_ipv4(&pkt, skb, state);

		break;

net/netfilter/nft_ct.c

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ static int nft_ct_get_dump(struct sk_buff *skb, const struct nft_expr *expr) 
		goto nla_put_failure;



	switch (priv->key) {

	case NFT_CT_L3PROTOCOL:

	case NFT_CT_PROTOCOL:

	case NFT_CT_SRC:

	case NFT_CT_DST: