Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
ethernet
/
mellanox
/
mlxsw
/
spectrum_switchdev.c
diff --git
a/kernel/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
b/kernel/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index
7dbeafa
..
d4c4c2b
100644
(file)
--- a/
kernel/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/
kernel/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@
-232,8
+232,13
@@
static int mlxsw_sp_port_attr_br_ageing_set(struct mlxsw_sp_port *mlxsw_sp_port,
unsigned long ageing_jiffies = clock_t_to_jiffies(ageing_clock_t);
u32 ageing_time = jiffies_to_msecs(ageing_jiffies) / 1000;
unsigned long ageing_jiffies = clock_t_to_jiffies(ageing_clock_t);
u32 ageing_time = jiffies_to_msecs(ageing_jiffies) / 1000;
- if (switchdev_trans_ph_prepare(trans))
- return 0;
+ if (switchdev_trans_ph_prepare(trans)) {
+ if (ageing_time < MLXSW_SP_MIN_AGEING_TIME ||
+ ageing_time > MLXSW_SP_MAX_AGEING_TIME)
+ return -ERANGE;
+ else
+ return 0;
+ }
return mlxsw_sp_ageing_set(mlxsw_sp, ageing_time);
}
return mlxsw_sp_ageing_set(mlxsw_sp, ageing_time);
}