diff options
| -rw-r--r-- | drivers/net/team/team.c | 7 | ||||
| -rw-r--r-- | include/linux/if_team.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index fe3fd77821bf..12222290c802 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1542,6 +1542,7 @@ static int team_change_mtu(struct net_device *dev, int new_mtu) * to traverse list in reverse under rcu_read_lock */ mutex_lock(&team->lock); + team->port_mtu_change_allowed = true; list_for_each_entry(port, &team->port_list, list) { err = dev_set_mtu(port->dev, new_mtu); if (err) { @@ -1550,6 +1551,7 @@ static int team_change_mtu(struct net_device *dev, int new_mtu) goto unwind; } } + team->port_mtu_change_allowed = false; mutex_unlock(&team->lock); dev->mtu = new_mtu; @@ -1559,6 +1561,7 @@ static int team_change_mtu(struct net_device *dev, int new_mtu) unwind: list_for_each_entry_continue_reverse(port, &team->port_list, list) dev_set_mtu(port->dev, dev->mtu); + team->port_mtu_change_allowed = false; mutex_unlock(&team->lock); return err; @@ -2678,7 +2681,9 @@ static int team_device_event(struct notifier_block *unused, break; case NETDEV_CHANGEMTU: /* Forbid to change mtu of underlaying device */ - return NOTIFY_BAD; + if (!port->team->port_mtu_change_allowed) + return NOTIFY_BAD; + break; case NETDEV_PRE_TYPE_CHANGE: /* Forbid to change type of underlaying device */ return NOTIFY_BAD; diff --git a/include/linux/if_team.h b/include/linux/if_team.h index 16fae6436d0e..25b8b15197b0 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h @@ -193,6 +193,7 @@ struct team { bool user_carrier_enabled; bool queue_override_enabled; struct list_head *qom_lists; /* array of queue override mapping lists */ + bool port_mtu_change_allowed; long mode_priv[TEAM_MODE_PRIV_LONGS]; }; |