Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Resolve conflict between commit 264640fc2c5f4f ("ipv6: distinguish frag
queues by device for multicast and link-local packets") from the net
tree and commit 029f7f3b8701c ("netfilter: ipv6: nf_defrag: avoid/free
clone operations") from the nf-next tree.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Conflicts:
	net/ipv6/netfilter/nf_conntrack_reasm.c

2 files changed, 3 insertions, 2 deletions

diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index 85a465b773e5..5bcd1b0cc2ec 100644
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -176,7 +176,7 @@ void nft_meta_get_eval(const struct nft_expr *expr,
                 sk = skb_to_full_sk(skb);
                 if (!sk || !sk_fullsock(sk))
                         goto err;
-                *dest = sk->sk_classid;
+                *dest = sock_cgroup_classid(&sk->sk_cgrp_data);
                 break;
 #endif
         default:
diff --git a/net/netfilter/xt_cgroup.c b/net/netfilter/xt_cgroup.c
index a1d126f29463..54eaeb45ce99 100644
--- a/net/netfilter/xt_cgroup.c
+++ b/net/netfilter/xt_cgroup.c
@@ -42,7 +42,8 @@ cgroup_mt(const struct sk_buff *skb, struct xt_action_param *par)
         if (skb->sk == NULL || !sk_fullsock(skb->sk))
                 return false;
 
-        return (info->id == skb->sk->sk_classid) ^ info->invert;
+        return (info->id == sock_cgroup_classid(&skb->sk->sk_cgrp_data)) ^
+                info->invert;
 }
 
 static struct xt_match cgroup_mt_reg __read_mostly = {