* [patch net-next] mlxsw: spectrum: Add "spectrum" prefix macro
@ 2017-12-17 16:15 Jiri Pirko
2017-12-17 16:25 ` Joe Perches
0 siblings, 1 reply; 4+ messages in thread
From: Jiri Pirko @ 2017-12-17 16:15 UTC (permalink / raw)
To: netdev; +Cc: davem, arkadis, idosch, mlxsw
From: Arkadi Sharshevsky <arkadis@mellanox.com>
Add "spectrum" string prefix macro for error strings.
Signed-off-by: Arkadi Sharshevsky <arkadis@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 23 ++++++++++-------------
drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 ++
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index d373df7..57e5ab4 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -4168,13 +4168,11 @@ mlxsw_sp_master_lag_check(struct mlxsw_sp *mlxsw_sp,
u16 lag_id;
if (mlxsw_sp_lag_index_get(mlxsw_sp, lag_dev, &lag_id) != 0) {
- NL_SET_ERR_MSG(extack,
- "spectrum: Exceeded number of supported LAG devices");
+ NL_SET_ERR_MSG(extack, MLXSW_SP_PREFIX "Exceeded number of supported LAG devices");
return false;
}
if (lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH) {
- NL_SET_ERR_MSG(extack,
- "spectrum: LAG device using unsupported Tx type");
+ NL_SET_ERR_MSG(extack, MLXSW_SP_PREFIX "LAG device using unsupported Tx type");
return false;
}
return true;
@@ -4416,15 +4414,14 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev,
!netif_is_lag_master(upper_dev) &&
!netif_is_bridge_master(upper_dev) &&
!netif_is_ovs_master(upper_dev)) {
- NL_SET_ERR_MSG(extack,
- "spectrum: Unknown upper device type");
+ NL_SET_ERR_MSG(extack, MLXSW_SP_PREFIX "Unknown upper device type");
return -EINVAL;
}
if (!info->linking)
break;
if (netdev_has_any_upper_dev(upper_dev)) {
NL_SET_ERR_MSG(extack,
- "spectrum: Enslaving a port to a device that already has an upper device is not supported");
+ MLXSW_SP_PREFIX "Enslaving a port to a device that already has an upper device is not supported");
return -EINVAL;
}
if (netif_is_lag_master(upper_dev) &&
@@ -4433,23 +4430,23 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev,
return -EINVAL;
if (netif_is_lag_master(upper_dev) && vlan_uses_dev(dev)) {
NL_SET_ERR_MSG(extack,
- "spectrum: Master device is a LAG master and this device has a VLAN");
+ MLXSW_SP_PREFIX "Master device is a LAG master and this device has a VLAN");
return -EINVAL;
}
if (netif_is_lag_port(dev) && is_vlan_dev(upper_dev) &&
!netif_is_lag_master(vlan_dev_real_dev(upper_dev))) {
NL_SET_ERR_MSG(extack,
- "spectrum: Can not put a VLAN on a LAG port");
+ MLXSW_SP_PREFIX "Can not put a VLAN on a LAG port");
return -EINVAL;
}
if (netif_is_ovs_master(upper_dev) && vlan_uses_dev(dev)) {
NL_SET_ERR_MSG(extack,
- "spectrum: Master device is an OVS master and this device has a VLAN");
+ MLXSW_SP_PREFIX "Master device is an OVS master and this device has a VLAN");
return -EINVAL;
}
if (netif_is_ovs_port(dev) && is_vlan_dev(upper_dev)) {
NL_SET_ERR_MSG(extack,
- "spectrum: Can not put a VLAN on an OVS port");
+ MLXSW_SP_PREFIX "Can not put a VLAN on an OVS port");
return -EINVAL;
}
break;
@@ -4561,13 +4558,13 @@ static int mlxsw_sp_netdevice_port_vlan_event(struct net_device *vlan_dev,
case NETDEV_PRECHANGEUPPER:
upper_dev = info->upper_dev;
if (!netif_is_bridge_master(upper_dev)) {
- NL_SET_ERR_MSG(extack, "spectrum: VLAN devices only support bridge and VRF uppers");
+ NL_SET_ERR_MSG(extack, MLXSW_SP_PREFIX "VLAN devices only support bridge and VRF uppers");
return -EINVAL;
}
if (!info->linking)
break;
if (netdev_has_any_upper_dev(upper_dev)) {
- NL_SET_ERR_MSG(extack, "spectrum: Enslaving a port to a device that already has an upper device is not supported");
+ NL_SET_ERR_MSG(extack, MLXSW_SP_PREFIX "Enslaving a port to a device that already has an upper device is not supported");
return -EINVAL;
}
break;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index a0adcd8..36a0335 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -66,6 +66,8 @@
#define MLXSW_SP_KVD_LINEAR_SIZE 98304 /* entries */
#define MLXSW_SP_KVD_GRANULARITY 128
+#define MLXSW_SP_PREFIX "spectrum: "
+
struct mlxsw_sp_port;
struct mlxsw_sp_rif;
--
2.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [patch net-next] mlxsw: spectrum: Add "spectrum" prefix macro
2017-12-17 16:15 [patch net-next] mlxsw: spectrum: Add "spectrum" prefix macro Jiri Pirko
@ 2017-12-17 16:25 ` Joe Perches
2017-12-19 16:09 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Joe Perches @ 2017-12-17 16:25 UTC (permalink / raw)
To: Jiri Pirko, netdev; +Cc: davem, arkadis, idosch, mlxsw
On Sun, 2017-12-17 at 17:15 +0100, Jiri Pirko wrote:
> From: Arkadi Sharshevsky <arkadis@mellanox.com>
>
> Add "spectrum" string prefix macro for error strings.
[]
> diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
[]
> @@ -4168,13 +4168,11 @@ mlxsw_sp_master_lag_check(struct mlxsw_sp *mlxsw_sp,
> u16 lag_id;
>
> if (mlxsw_sp_lag_index_get(mlxsw_sp, lag_dev, &lag_id) != 0) {
> - NL_SET_ERR_MSG(extack,
> - "spectrum: Exceeded number of supported LAG devices");
> + NL_SET_ERR_MSG(extack, MLXSW_SP_PREFIX "Exceeded number of supported LAG devices");
Perhaps use NL_SET_ERR_MSG_MOD instead.
etc...
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch net-next] mlxsw: spectrum: Add "spectrum" prefix macro
2017-12-17 16:25 ` Joe Perches
@ 2017-12-19 16:09 ` David Miller
2017-12-19 16:17 ` Jiri Pirko
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2017-12-19 16:09 UTC (permalink / raw)
To: joe; +Cc: jiri, netdev, arkadis, idosch, mlxsw
From: Joe Perches <joe@perches.com>
Date: Sun, 17 Dec 2017 08:25:00 -0800
> On Sun, 2017-12-17 at 17:15 +0100, Jiri Pirko wrote:
>> From: Arkadi Sharshevsky <arkadis@mellanox.com>
>>
>> Add "spectrum" string prefix macro for error strings.
> []
>> diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
> []
>> @@ -4168,13 +4168,11 @@ mlxsw_sp_master_lag_check(struct mlxsw_sp *mlxsw_sp,
>> u16 lag_id;
>>
>> if (mlxsw_sp_lag_index_get(mlxsw_sp, lag_dev, &lag_id) != 0) {
>> - NL_SET_ERR_MSG(extack,
>> - "spectrum: Exceeded number of supported LAG devices");
>> + NL_SET_ERR_MSG(extack, MLXSW_SP_PREFIX "Exceeded number of supported LAG devices");
>
> Perhaps use NL_SET_ERR_MSG_MOD instead.
Yeah that probably makes sense.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch net-next] mlxsw: spectrum: Add "spectrum" prefix macro
2017-12-19 16:09 ` David Miller
@ 2017-12-19 16:17 ` Jiri Pirko
0 siblings, 0 replies; 4+ messages in thread
From: Jiri Pirko @ 2017-12-19 16:17 UTC (permalink / raw)
To: David Miller; +Cc: joe, netdev, arkadis, idosch, mlxsw
Tue, Dec 19, 2017 at 05:09:06PM CET, davem@davemloft.net wrote:
>From: Joe Perches <joe@perches.com>
>Date: Sun, 17 Dec 2017 08:25:00 -0800
>
>> On Sun, 2017-12-17 at 17:15 +0100, Jiri Pirko wrote:
>>> From: Arkadi Sharshevsky <arkadis@mellanox.com>
>>>
>>> Add "spectrum" string prefix macro for error strings.
>> []
>>> diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
>> []
>>> @@ -4168,13 +4168,11 @@ mlxsw_sp_master_lag_check(struct mlxsw_sp *mlxsw_sp,
>>> u16 lag_id;
>>>
>>> if (mlxsw_sp_lag_index_get(mlxsw_sp, lag_dev, &lag_id) != 0) {
>>> - NL_SET_ERR_MSG(extack,
>>> - "spectrum: Exceeded number of supported LAG devices");
>>> + NL_SET_ERR_MSG(extack, MLXSW_SP_PREFIX "Exceeded number of supported LAG devices");
>>
>> Perhaps use NL_SET_ERR_MSG_MOD instead.
>
>Yeah that probably makes sense.
Yes. Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-12-19 16:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-17 16:15 [patch net-next] mlxsw: spectrum: Add "spectrum" prefix macro Jiri Pirko
2017-12-17 16:25 ` Joe Perches
2017-12-19 16:09 ` David Miller
2017-12-19 16:17 ` Jiri Pirko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).