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

tipc: Introduce __tipc_nl_bearer_enable 



Introduce __tipc_nl_bearer_enable() 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 d59d8b77

net/tipc/bearer.c

+10 −7
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info) 
	return err;

}



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

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

{

	int err;

	char *bearer;
@@ -897,15 +897,18 @@ int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info) 
			prio = nla_get_u32(props[TIPC_NLA_PROP_PRIO]);

	}



	rtnl_lock();

	err = tipc_enable_bearer(net, bearer, domain, prio, attrs);

	if (err) {

		rtnl_unlock();

		return err;

	return tipc_enable_bearer(net, bearer, domain, prio, attrs);

}



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

{

	int err;



	rtnl_lock();

	err = __tipc_nl_bearer_enable(skb, info);

	rtnl_unlock();



	return 0;

	return err;

}



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

net/tipc/bearer.h

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ extern struct tipc_media udp_media_info; 
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_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);

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