Commit d795527d authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski

net: dsa: use NL_SET_ERR_MSG_WEAK_MOD() more consistently

Now that commit 028fb19c ("netlink: provide an ability to set
default extack message") provides a weak function that doesn't override
an existing extack message provided by the driver, it makes sense to use
it also for LAG and HSR offloading, not just for bridge offloading.

Also consistently put the message string on a separate line, to reduce
line length from 92 to 84 characters.
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20230202140354.3158129-1-vladimir.oltean@nxp.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8065c0e1
...@@ -2692,7 +2692,8 @@ static int dsa_slave_changeupper(struct net_device *dev, ...@@ -2692,7 +2692,8 @@ static int dsa_slave_changeupper(struct net_device *dev,
if (!err) if (!err)
dsa_bridge_mtu_normalization(dp); dsa_bridge_mtu_normalization(dp);
if (err == -EOPNOTSUPP) { if (err == -EOPNOTSUPP) {
NL_SET_ERR_MSG_WEAK_MOD(extack, "Offloading not supported"); NL_SET_ERR_MSG_WEAK_MOD(extack,
"Offloading not supported");
err = 0; err = 0;
} }
err = notifier_from_errno(err); err = notifier_from_errno(err);
...@@ -2705,8 +2706,8 @@ static int dsa_slave_changeupper(struct net_device *dev, ...@@ -2705,8 +2706,8 @@ static int dsa_slave_changeupper(struct net_device *dev,
err = dsa_port_lag_join(dp, info->upper_dev, err = dsa_port_lag_join(dp, info->upper_dev,
info->upper_info, extack); info->upper_info, extack);
if (err == -EOPNOTSUPP) { if (err == -EOPNOTSUPP) {
NL_SET_ERR_MSG_MOD(info->info.extack, NL_SET_ERR_MSG_WEAK_MOD(extack,
"Offloading not supported"); "Offloading not supported");
err = 0; err = 0;
} }
err = notifier_from_errno(err); err = notifier_from_errno(err);
...@@ -2718,8 +2719,8 @@ static int dsa_slave_changeupper(struct net_device *dev, ...@@ -2718,8 +2719,8 @@ static int dsa_slave_changeupper(struct net_device *dev,
if (info->linking) { if (info->linking) {
err = dsa_port_hsr_join(dp, info->upper_dev); err = dsa_port_hsr_join(dp, info->upper_dev);
if (err == -EOPNOTSUPP) { if (err == -EOPNOTSUPP) {
NL_SET_ERR_MSG_MOD(info->info.extack, NL_SET_ERR_MSG_WEAK_MOD(extack,
"Offloading not supported"); "Offloading not supported");
err = 0; err = 0;
} }
err = notifier_from_errno(err); err = notifier_from_errno(err);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment