From: David S. Miller <davem@davemloft.net>
Date: Mon, 19 Feb 2018 23:46:11 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f5c0c6f4299f870f074235fbf552ecf957fc249c;p=linux.git

Merge git://git./linux/kernel/git/davem/net
---

f5c0c6f4299f870f074235fbf552ecf957fc249c
diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 267a0120c7a42,f7948e983637d..05146970c19cf
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@@ -793,23 -796,26 +796,26 @@@ static struct mlxsw_sp_vr *mlxsw_sp_vr_
  
  	vr = mlxsw_sp_vr_find_unused(mlxsw_sp);
  	if (!vr) {
 -		NL_SET_ERR_MSG(extack, "spectrum: Exceeded number of supported virtual routers");
 +		NL_SET_ERR_MSG_MOD(extack, "Exceeded number of supported virtual routers");
  		return ERR_PTR(-EBUSY);
  	}
- 	vr->fib4 = mlxsw_sp_fib_create(mlxsw_sp, vr, MLXSW_SP_L3_PROTO_IPV4);
- 	if (IS_ERR(vr->fib4))
- 		return ERR_CAST(vr->fib4);
- 	vr->fib6 = mlxsw_sp_fib_create(mlxsw_sp, vr, MLXSW_SP_L3_PROTO_IPV6);
- 	if (IS_ERR(vr->fib6)) {
- 		err = PTR_ERR(vr->fib6);
+ 	fib4 = mlxsw_sp_fib_create(mlxsw_sp, vr, MLXSW_SP_L3_PROTO_IPV4);
+ 	if (IS_ERR(fib4))
+ 		return ERR_CAST(fib4);
+ 	fib6 = mlxsw_sp_fib_create(mlxsw_sp, vr, MLXSW_SP_L3_PROTO_IPV6);
+ 	if (IS_ERR(fib6)) {
+ 		err = PTR_ERR(fib6);
  		goto err_fib6_create;
  	}
- 	vr->mr4_table = mlxsw_sp_mr_table_create(mlxsw_sp, vr->id,
- 						 MLXSW_SP_L3_PROTO_IPV4);
- 	if (IS_ERR(vr->mr4_table)) {
- 		err = PTR_ERR(vr->mr4_table);
+ 	mr4_table = mlxsw_sp_mr_table_create(mlxsw_sp, vr->id,
+ 					     MLXSW_SP_L3_PROTO_IPV4);
+ 	if (IS_ERR(mr4_table)) {
+ 		err = PTR_ERR(mr4_table);
  		goto err_mr_table_create;
  	}
+ 	vr->fib4 = fib4;
+ 	vr->fib6 = fib6;
+ 	vr->mr4_table = mr4_table;
  	vr->tb_id = tb_id;
  	return vr;
  
diff --cc net/tipc/bearer.c
index 83d284feab1a5,3e3dce3d4c63d..f3d2e83313e1d
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@@ -944,8 -954,10 +954,8 @@@ int tipc_nl_bearer_add(struct sk_buff *
  	return 0;
  }
  
- int tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info)
+ int __tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info)
  {
 -	int err;
 -	char *name;
  	struct tipc_bearer *b;
  	struct nlattr *attrs[TIPC_NLA_BEARER_MAX + 1];
  	struct net *net = sock_net(skb->sk);
@@@ -977,15 -984,11 +984,13 @@@
  
  		err = tipc_nl_parse_link_prop(attrs[TIPC_NLA_BEARER_PROP],
  					      props);
- 		if (err) {
- 			rtnl_unlock();
+ 		if (err)
  			return err;
- 		}
  
 -		if (props[TIPC_NLA_PROP_TOL])
 +		if (props[TIPC_NLA_PROP_TOL]) {
  			b->tolerance = nla_get_u32(props[TIPC_NLA_PROP_TOL]);
 +			tipc_node_apply_tolerance(net, b);
 +		}
  		if (props[TIPC_NLA_PROP_PRIO])
  			b->priority = nla_get_u32(props[TIPC_NLA_PROP_PRIO]);
  		if (props[TIPC_NLA_PROP_WIN])