aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/bearer.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/bearer.c')
-rw-r--r--net/tipc/bearer.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 61b6625f93a4..faf8fa033740 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -855,7 +855,7 @@ int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info)
855 return err; 855 return err;
856} 856}
857 857
858int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info) 858int __tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info)
859{ 859{
860 int err; 860 int err;
861 char *bearer; 861 char *bearer;
@@ -897,15 +897,18 @@ int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info)
897 prio = nla_get_u32(props[TIPC_NLA_PROP_PRIO]); 897 prio = nla_get_u32(props[TIPC_NLA_PROP_PRIO]);
898 } 898 }
899 899
900 return tipc_enable_bearer(net, bearer, domain, prio, attrs);
901}
902
903int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info)
904{
905 int err;
906
900 rtnl_lock(); 907 rtnl_lock();
901 err = tipc_enable_bearer(net, bearer, domain, prio, attrs); 908 err = __tipc_nl_bearer_enable(skb, info);
902 if (err) {
903 rtnl_unlock();
904 return err;
905 }
906 rtnl_unlock(); 909 rtnl_unlock();
907 910
908 return 0; 911 return err;
909} 912}
910 913
911int tipc_nl_bearer_add(struct sk_buff *skb, struct genl_info *info) 914int tipc_nl_bearer_add(struct sk_buff *skb, struct genl_info *info)