Commit 31ef30c7 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

bridge: remove dev_put() in add_del_if()

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: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c84b3268
...@@ -81,6 +81,7 @@ static int get_fdb_entries(struct net_bridge *br, void __user *userbuf, ...@@ -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) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment