From 054a6c306bbe6c8ae5938d2ffe60e71fbe668422 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 16 Oct 2009 06:38:46 +0000 Subject: [PATCH] --- yaml --- r: 170746 b: refs/heads/master c: ad959e76f0fa94d299a8c25cb45de4d1b845e9ce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/packet/af_packet.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 4239ef9c067b..a91f22014790 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94b059520d6c0cea852dc9a3e9033c6f123df7c1 +refs/heads/master: ad959e76f0fa94d299a8c25cb45de4d1b845e9ce diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c index dac775e0bc72..ff752c606413 100644 --- a/trunk/net/packet/af_packet.c +++ b/trunk/net/packet/af_packet.c @@ -1664,11 +1664,9 @@ static int packet_mc_drop(struct sock *sk, struct packet_mreq_max *mreq) if (--ml->count == 0) { struct net_device *dev; *mlp = ml->next; - dev = dev_get_by_index(sock_net(sk), ml->ifindex); - if (dev) { + dev = __dev_get_by_index(sock_net(sk), ml->ifindex); + if (dev) packet_dev_mc(dev, ml, -1); - dev_put(dev); - } kfree(ml); } rtnl_unlock(); @@ -1692,11 +1690,9 @@ static void packet_flush_mclist(struct sock *sk) struct net_device *dev; po->mclist = ml->next; - dev = dev_get_by_index(sock_net(sk), ml->ifindex); - if (dev != NULL) { + dev = __dev_get_by_index(sock_net(sk), ml->ifindex); + if (dev != NULL) packet_dev_mc(dev, ml, -1); - dev_put(dev); - } kfree(ml); } rtnl_unlock();