diff options
| -rw-r--r-- | net/dsa/slave.c | 5 | ||||
| -rw-r--r-- | net/dsa/switch.c | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 7ba505825db2..5d7f6cada6a8 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -373,11 +373,6 @@ static int dsa_slave_port_obj_add(struct net_device *dev, struct dsa_port *dp = dsa_slave_to_port(dev); int err; - /* For the prepare phase, ensure the full set of changes is feasable in - * one go in order to signal a failure properly. If an operation is not - * supported, return -EOPNOTSUPP. - */ - switch (obj->id) { case SWITCHDEV_OBJ_ID_PORT_MDB: if (obj->orig_dev != dev) diff --git a/net/dsa/switch.c b/net/dsa/switch.c index f92eaacb17cf..21d2f842d068 100644 --- a/net/dsa/switch.c +++ b/net/dsa/switch.c @@ -298,10 +298,6 @@ static int dsa_switch_event(struct notifier_block *nb, break; } - /* Non-switchdev operations cannot be rolled back. If a DSA driver - * returns an error during the chained call, switch chips may be in an - * inconsistent state. - */ if (err) dev_dbg(ds->dev, "breaking chain for DSA event %lu (%d)\n", event, err); |