if (dev_net(dev) != sock_net(sk))
goto drop;
-@@ -1072,6 +1075,7 @@ static int packet_create(struct net *net
+@@ -1073,6 +1076,7 @@ static int packet_create(struct net *net
spin_lock_init(&po->bind_lock);
mutex_init(&po->pg_vec_lock);
po->prot_hook.func = packet_rcv;
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -1411,6 +1415,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -1413,6 +1417,16 @@ packet_setsockopt(struct socket *sock, i
ret = packet_mc_drop(sk, &mreq);
return ret;
}
#ifdef CONFIG_PACKET_MMAP
case PACKET_RX_RING:
-@@ -1542,6 +1556,13 @@ static int packet_getsockopt(struct sock
+@@ -1544,6 +1558,13 @@ static int packet_getsockopt(struct sock
data = &val;
break;