1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 33008c1d1d67..ce4989be86d9 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1724,6 +1724,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) {
@@ -1732,6 +1733,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;
@@ -1741,6 +1743,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;
@@ -2834,8 +2837,10 @@ static int team_device_event(struct notifier_block *unused,
         case NETDEV_UP:
                 if (netif_carrier_ok(dev))
                         team_port_change_check(port, true);
+                break;
         case NETDEV_DOWN:
                 team_port_change_check(port, false);
+                break;
         case NETDEV_CHANGE:
                 if (netif_running(port->dev))
                         team_port_change_check(port,
@@ -2849,7 +2854,9 @@ static int team_device_event(struct notifier_block *unused,
                 break;
         case NETDEV_PRECHANGEMTU:
                 /* 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;