adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

bridge: remove dev_put() in add_del_if()

Browse source 
add_del_if() is called with RTNL, we can use __dev_get_by_index()
instead of [dev_get_by_index() + dev_put()]

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2009-11-05 20:47:35 -08:00 committed by David S. Miller
parent c84b3268da
commit 31ef30c760
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/bridge/br_ioctl.c
View file

@ -81,6 +81,7 @@ static int get_fdb_entries(struct net_bridge *br, void __user *userbuf,
return num; return num;
} }
/* called with RTNL */
static int add_del_if(struct net_bridge *br, int ifindex, int isadd) static int add_del_if(struct net_bridge *br, int ifindex, int isadd)
{ {
struct net_device *dev; struct net_device *dev;
@ -89,7 +90,7 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd)
if (!capable(CAP_NET_ADMIN)) if (!capable(CAP_NET_ADMIN))
return -EPERM; return -EPERM;
dev = dev_get_by_index(dev_net(br->dev), ifindex); dev = __dev_get_by_index(dev_net(br->dev), ifindex);
if (dev == NULL) if (dev == NULL)
return -EINVAL; return -EINVAL;
@ -98,7 +99,6 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd)
else else
ret = br_del_if(br, dev); ret = br_del_if(br, dev);
dev_put(dev);
return ret; return ret;
} }