Commit d59d8b77 authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

tipc: Introduce __tipc_nl_bearer_disable 



Introduce __tipc_nl_bearer_disable() which doesn't hold RTNL lock.

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e5d1a1ee

net/tipc/bearer.c

+13 −6
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ int tipc_nl_bearer_get(struct sk_buff *skb, struct genl_info *info) 
	return err;

}



int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info)

int __tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info)

{

	int err;

	char *name;
@@ -835,19 +835,26 @@ int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info) 


	name = nla_data(attrs[TIPC_NLA_BEARER_NAME]);



	rtnl_lock();

	bearer = tipc_bearer_find(net, name);

	if (!bearer) {

		rtnl_unlock();

	if (!bearer)

		return -EINVAL;

	}



	bearer_disable(net, bearer);

	rtnl_unlock();



	return 0;

}



int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info)

{

	int err;



	rtnl_lock();

	err = __tipc_nl_bearer_disable(skb, info);

	rtnl_unlock();



	return err;

}



int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info)

{

	int err;

net/tipc/bearer.h

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ extern struct tipc_media udp_media_info; 
#endif



int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info);

int __tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info);

int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info);

int tipc_nl_bearer_dump(struct sk_buff *skb, struct netlink_callback *cb);

int tipc_nl_bearer_get(struct sk_buff *skb, struct genl_info *info);