--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3040,6 +3040,20 @@ static int mvneta_check_mtu_valid(struct
+@@ -3044,6 +3044,20 @@ static int mvneta_check_mtu_valid(struct
return mtu;
}
/* Change the device mtu */
static int mvneta_change_mtu(struct net_device *dev, int mtu)
{
-@@ -3064,6 +3078,7 @@ static int mvneta_change_mtu(struct net_
+@@ -3068,6 +3082,7 @@ static int mvneta_change_mtu(struct net_
* reallocation of the queues
*/
mvneta_stop_dev(pp);
mvneta_cleanup_txqs(pp);
mvneta_cleanup_rxqs(pp);
-@@ -3087,6 +3102,7 @@ static int mvneta_change_mtu(struct net_
+@@ -3091,6 +3106,7 @@ static int mvneta_change_mtu(struct net_
return ret;
}
mvneta_start_dev(pp);
mvneta_port_up(pp);
-@@ -3240,20 +3256,6 @@ static void mvneta_mdio_remove(struct mv
+@@ -3244,20 +3260,6 @@ static void mvneta_mdio_remove(struct mv
pp->phy_dev = NULL;
}