net: dsa: use NL_SET_ERR_MSG_WEAK_MOD() more consistently

Now that commit 028fb19c6ba7 ("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: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20230202140354.3158129-1-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 26c458f..6957971 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -2692,7 +2692,8 @@ static int dsa_slave_changeupper(struct net_device *dev,
                        if (!err)
                                dsa_bridge_mtu_normalization(dp);
                        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 = notifier_from_errno(err);
@@ -2705,8 +2706,8 @@ static int dsa_slave_changeupper(struct net_device *dev,
                        err = dsa_port_lag_join(dp, info->upper_dev,
                                                info->upper_info, extack);
                        if (err == -EOPNOTSUPP) {
-                               NL_SET_ERR_MSG_MOD(info->info.extack,
-                                                  "Offloading not supported");
+                               NL_SET_ERR_MSG_WEAK_MOD(extack,
+                                                       "Offloading not supported");
                                err = 0;
                        }
                        err = notifier_from_errno(err);
@@ -2718,8 +2719,8 @@ static int dsa_slave_changeupper(struct net_device *dev,
                if (info->linking) {
                        err = dsa_port_hsr_join(dp, info->upper_dev);
                        if (err == -EOPNOTSUPP) {
-                               NL_SET_ERR_MSG_MOD(info->info.extack,
-                                                  "Offloading not supported");
+                               NL_SET_ERR_MSG_WEAK_MOD(extack,
+                                                       "Offloading not supported");
                                err = 0;
                        }
                        err = notifier_from_errno(err);