diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index dc8ca7c36adfe7981238f4bfeee7157c4d0743ea..be765a9915f3a3a201db0ff117f99dedf2751202 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2506,7 +2506,11 @@ struct packet_type {
 	void			*af_packet_priv;
 	struct list_head	list;
 
+#ifndef __GENKSYMS__
+	struct net              *af_packet_net;
+#else
 	KABI_RESERVE(1)
+#endif
 	KABI_RESERVE(2)
 	KABI_RESERVE(3)
 	KABI_RESERVE(4)
diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
index 63881f72ef71c90c67683bf586dd205ffe864f5b..6d4343e0092f5c894e9baaea772f7d798c48b1f0 100644
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -252,7 +252,8 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
 
 	if (v == SEQ_START_TOKEN)
 		seq_puts(seq, "Type Device      Function\n");
-	else if (pt->dev == NULL || dev_net(pt->dev) == seq_file_net(seq)) {
+	else if ((!pt->af_packet_net || net_eq(pt->af_packet_net, seq_file_net(seq))) &&
+		 (!pt->dev || net_eq(dev_net(pt->dev), seq_file_net(seq)))) {
 		if (pt->type == htons(ETH_P_ALL))
 			seq_puts(seq, "ALL ");
 		else
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index a9f92dc901921c94461215e6f3919e9c4eda706a..c64bcba21e47eccee34bbab5cd96d2c984897d37 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1720,6 +1720,7 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags)
 		match->prot_hook.dev = po->prot_hook.dev;
 		match->prot_hook.func = packet_rcv_fanout;
 		match->prot_hook.af_packet_priv = match;
+		match->prot_hook.af_packet_net = read_pnet(&match->net);
 		match->prot_hook.id_match = match_fanout_group;
 		list_add(&match->list, &fanout_list);
 	}
@@ -3306,6 +3307,7 @@ static int packet_create(struct net *net, struct socket *sock, int protocol,
 		po->prot_hook.func = packet_rcv_spkt;
 
 	po->prot_hook.af_packet_priv = sk;
+	po->prot_hook.af_packet_net = sock_net(sk);
 
 	if (proto) {
 		po->prot_hook.type = proto;