mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-02-24 06:24:27 +00:00
af_packet: mc_drop/flush_mclist changes
We hold RTNL, we can use __dev_get_by_index() instead of dev_get_by_index() Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
94b059520d
commit
ad959e76f0
@ -1664,11 +1664,9 @@ static int packet_mc_drop(struct sock *sk, struct packet_mreq_max *mreq)
|
|||||||
if (--ml->count == 0) {
|
if (--ml->count == 0) {
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
*mlp = ml->next;
|
*mlp = ml->next;
|
||||||
dev = dev_get_by_index(sock_net(sk), ml->ifindex);
|
dev = __dev_get_by_index(sock_net(sk), ml->ifindex);
|
||||||
if (dev) {
|
if (dev)
|
||||||
packet_dev_mc(dev, ml, -1);
|
packet_dev_mc(dev, ml, -1);
|
||||||
dev_put(dev);
|
|
||||||
}
|
|
||||||
kfree(ml);
|
kfree(ml);
|
||||||
}
|
}
|
||||||
rtnl_unlock();
|
rtnl_unlock();
|
||||||
@ -1692,11 +1690,9 @@ static void packet_flush_mclist(struct sock *sk)
|
|||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
|
|
||||||
po->mclist = ml->next;
|
po->mclist = ml->next;
|
||||||
dev = dev_get_by_index(sock_net(sk), ml->ifindex);
|
dev = __dev_get_by_index(sock_net(sk), ml->ifindex);
|
||||||
if (dev != NULL) {
|
if (dev != NULL)
|
||||||
packet_dev_mc(dev, ml, -1);
|
packet_dev_mc(dev, ml, -1);
|
||||||
dev_put(dev);
|
|
||||||
}
|
|
||||||
kfree(ml);
|
kfree(ml);
|
||||||
}
|
}
|
||||||
rtnl_unlock();
|
rtnl_unlock();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user