Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2 files changed, 2 insertions, 1 deletions

diff --git a/net/netfilter/nf_tables_netdev.c b/net/netfilter/nf_tables_netdev.c
index 7b9c053ba750..edb3502f2016 100644
--- a/net/netfilter/nf_tables_netdev.c
+++ b/net/netfilter/nf_tables_netdev.c
@@ -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;
diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
index 8cbca3432f90..939921532764 100644
--- a/net/netfilter/nft_ct.c
+++ b/net/netfilter/nft_ct.c
@@ -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: