|
@@ -128,44 +128,23 @@ int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static unsigned int dsa_fastest_ageing_time(struct dsa_switch *ds,
|
|
|
- unsigned int ageing_time)
|
|
|
-{
|
|
|
- int i;
|
|
|
-
|
|
|
- for (i = 0; i < ds->num_ports; ++i) {
|
|
|
- struct dsa_port *dp = &ds->ports[i];
|
|
|
-
|
|
|
- if (dp->ageing_time && dp->ageing_time < ageing_time)
|
|
|
- ageing_time = dp->ageing_time;
|
|
|
- }
|
|
|
-
|
|
|
- return ageing_time;
|
|
|
-}
|
|
|
-
|
|
|
int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock,
|
|
|
struct switchdev_trans *trans)
|
|
|
{
|
|
|
unsigned long ageing_jiffies = clock_t_to_jiffies(ageing_clock);
|
|
|
unsigned int ageing_time = jiffies_to_msecs(ageing_jiffies);
|
|
|
- struct dsa_switch *ds = dp->ds;
|
|
|
+ struct dsa_notifier_ageing_time_info info = {
|
|
|
+ .ageing_time = ageing_time,
|
|
|
+ .sw_index = dp->ds->index,
|
|
|
+ .trans = trans,
|
|
|
+ };
|
|
|
|
|
|
- if (switchdev_trans_ph_prepare(trans)) {
|
|
|
- if (ds->ageing_time_min && ageing_time < ds->ageing_time_min)
|
|
|
- return -ERANGE;
|
|
|
- if (ds->ageing_time_max && ageing_time > ds->ageing_time_max)
|
|
|
- return -ERANGE;
|
|
|
- return 0;
|
|
|
- }
|
|
|
+ if (switchdev_trans_ph_prepare(trans))
|
|
|
+ return dsa_port_notify(dp, DSA_NOTIFIER_AGEING_TIME, &info);
|
|
|
|
|
|
- /* Keep the fastest ageing time in case of multiple bridges */
|
|
|
dp->ageing_time = ageing_time;
|
|
|
- ageing_time = dsa_fastest_ageing_time(ds, ageing_time);
|
|
|
|
|
|
- if (ds->ops->set_ageing_time)
|
|
|
- return ds->ops->set_ageing_time(ds, ageing_time);
|
|
|
-
|
|
|
- return 0;
|
|
|
+ return dsa_port_notify(dp, DSA_NOTIFIER_AGEING_TIME, &info);
|
|
|
}
|
|
|
|
|
|
int dsa_port_fdb_add(struct dsa_port *dp,
|