diff mbox series

[net-next] net: dsa: Restore MTU on master device on unload

Message ID 1544285118-23312-1-git-send-email-andrew@lunn.ch
State Accepted, archived
Delegated to: David Miller
Headers show
Series [net-next] net: dsa: Restore MTU on master device on unload | expand

Commit Message

Andrew Lunn Dec. 8, 2018, 4:05 p.m. UTC 
A previous change tries to set the MTU on the master device to take
into account the DSA overheads. This patch tries to reset the master
device back to the default MTU.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 net/dsa/master.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

Comments

David Miller Dec. 9, 2018, 5:39 a.m. UTC | #1 
From: Andrew Lunn <andrew@lunn.ch>
Date: Sat,  8 Dec 2018 17:05:18 +0100

> A previous change tries to set the MTU on the master device to take
> into account the DSA overheads. This patch tries to reset the master
> device back to the default MTU.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>

Applied.
diff mbox series

Patch

diff --git a/net/dsa/master.c b/net/dsa/master.c
index 42f525bc68e2..a25242e71fb2 100644
--- a/net/dsa/master.c
+++ b/net/dsa/master.c
@@ -172,6 +172,18 @@  void dsa_master_set_mtu(struct net_device *dev, struct dsa_port *cpu_dp)
 	rtnl_unlock();
 }
 
+static void dsa_master_reset_mtu(struct net_device *dev)
+{
+	int err;
+
+	rtnl_lock();
+	err = dev_set_mtu(dev, ETH_DATA_LEN);
+	if (err)
+		netdev_dbg(dev,
+			   "Unable to reset MTU to exclude DSA overheads\n");
+	rtnl_unlock();
+}
+
 int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp)
 {
 	dsa_master_set_mtu(dev,  cpu_dp);
@@ -190,6 +202,7 @@  int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp)
 void dsa_master_teardown(struct net_device *dev)
 {
 	dsa_master_ethtool_teardown(dev);
+	dsa_master_reset_mtu(dev);
 
 	dev->dsa_ptr = NULL;