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 8f81805c6825..d16800f5168a 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -889,6 +889,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) { @@ -897,6 +898,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; @@ -906,6 +908,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; @@ -1671,7 +1674,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 58404b0c5010..b159b10d915d 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h @@ -113,6 +113,7 @@ struct team { const struct team_mode *mode; struct team_mode_ops ops; + bool port_mtu_change_allowed; long mode_priv[TEAM_MODE_PRIV_LONGS]; }; |