|
@@ -5882,24 +5882,24 @@ static int mlxsw_sp_router_fib_rule_event(unsigned long event,
|
|
switch (info->family) {
|
|
switch (info->family) {
|
|
case AF_INET:
|
|
case AF_INET:
|
|
if (!fib4_rule_default(rule) && !rule->l3mdev)
|
|
if (!fib4_rule_default(rule) && !rule->l3mdev)
|
|
- err = -1;
|
|
|
|
|
|
+ err = -EOPNOTSUPP;
|
|
break;
|
|
break;
|
|
case AF_INET6:
|
|
case AF_INET6:
|
|
if (!fib6_rule_default(rule) && !rule->l3mdev)
|
|
if (!fib6_rule_default(rule) && !rule->l3mdev)
|
|
- err = -1;
|
|
|
|
|
|
+ err = -EOPNOTSUPP;
|
|
break;
|
|
break;
|
|
case RTNL_FAMILY_IPMR:
|
|
case RTNL_FAMILY_IPMR:
|
|
if (!ipmr_rule_default(rule) && !rule->l3mdev)
|
|
if (!ipmr_rule_default(rule) && !rule->l3mdev)
|
|
- err = -1;
|
|
|
|
|
|
+ err = -EOPNOTSUPP;
|
|
break;
|
|
break;
|
|
case RTNL_FAMILY_IP6MR:
|
|
case RTNL_FAMILY_IP6MR:
|
|
if (!ip6mr_rule_default(rule) && !rule->l3mdev)
|
|
if (!ip6mr_rule_default(rule) && !rule->l3mdev)
|
|
- err = -1;
|
|
|
|
|
|
+ err = -EOPNOTSUPP;
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
if (err < 0)
|
|
if (err < 0)
|
|
- NL_SET_ERR_MSG_MOD(extack, "FIB rules not supported. Aborting offload");
|
|
|
|
|
|
+ NL_SET_ERR_MSG_MOD(extack, "FIB rules not supported");
|
|
|
|
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|
|
@@ -5926,8 +5926,8 @@ static int mlxsw_sp_router_fib_event(struct notifier_block *nb,
|
|
case FIB_EVENT_RULE_DEL:
|
|
case FIB_EVENT_RULE_DEL:
|
|
err = mlxsw_sp_router_fib_rule_event(event, info,
|
|
err = mlxsw_sp_router_fib_rule_event(event, info,
|
|
router->mlxsw_sp);
|
|
router->mlxsw_sp);
|
|
- if (!err)
|
|
|
|
- return NOTIFY_DONE;
|
|
|
|
|
|
+ if (!err || info->extack)
|
|
|
|
+ return notifier_from_errno(err);
|
|
}
|
|
}
|
|
|
|
|
|
fib_work = kzalloc(sizeof(*fib_work), GFP_ATOMIC);
|
|
fib_work = kzalloc(sizeof(*fib_work), GFP_ATOMIC);
|