diff options
-rw-r--r-- | net/dsa/dsa_priv.h | 1 | ||||
-rw-r--r-- | net/dsa/port.c | 1 | ||||
-rw-r--r-- | net/dsa/switch.c | 4 |
3 files changed, 0 insertions, 6 deletions
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 1d52f9051d0e..c1d4180651af 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h | |||
@@ -32,7 +32,6 @@ enum { | |||
32 | struct dsa_notifier_ageing_time_info { | 32 | struct dsa_notifier_ageing_time_info { |
33 | struct switchdev_trans *trans; | 33 | struct switchdev_trans *trans; |
34 | unsigned int ageing_time; | 34 | unsigned int ageing_time; |
35 | int sw_index; | ||
36 | }; | 35 | }; |
37 | 36 | ||
38 | /* DSA_NOTIFIER_BRIDGE_* */ | 37 | /* DSA_NOTIFIER_BRIDGE_* */ |
diff --git a/net/dsa/port.c b/net/dsa/port.c index c88c0cec8454..efc3bce3a89d 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c | |||
@@ -135,7 +135,6 @@ int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock, | |||
135 | unsigned int ageing_time = jiffies_to_msecs(ageing_jiffies); | 135 | unsigned int ageing_time = jiffies_to_msecs(ageing_jiffies); |
136 | struct dsa_notifier_ageing_time_info info = { | 136 | struct dsa_notifier_ageing_time_info info = { |
137 | .ageing_time = ageing_time, | 137 | .ageing_time = ageing_time, |
138 | .sw_index = dp->ds->index, | ||
139 | .trans = trans, | 138 | .trans = trans, |
140 | }; | 139 | }; |
141 | 140 | ||
diff --git a/net/dsa/switch.c b/net/dsa/switch.c index c1e4b2d5a3ae..d8e5c311ee7c 100644 --- a/net/dsa/switch.c +++ b/net/dsa/switch.c | |||
@@ -37,10 +37,6 @@ static int dsa_switch_ageing_time(struct dsa_switch *ds, | |||
37 | unsigned int ageing_time = info->ageing_time; | 37 | unsigned int ageing_time = info->ageing_time; |
38 | struct switchdev_trans *trans = info->trans; | 38 | struct switchdev_trans *trans = info->trans; |
39 | 39 | ||
40 | /* Do not care yet about other switch chips of the fabric */ | ||
41 | if (ds->index != info->sw_index) | ||
42 | return 0; | ||
43 | |||
44 | if (switchdev_trans_ph_prepare(trans)) { | 40 | if (switchdev_trans_ph_prepare(trans)) { |
45 | if (ds->ageing_time_min && ageing_time < ds->ageing_time_min) | 41 | if (ds->ageing_time_min && ageing_time < ds->ageing_time_min) |
46 | return -ERANGE; | 42 | return -ERANGE; |