Merge tag 'pm-4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[cascardo/linux.git] / net / core / net-sysfs.c

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 7a0b616..6e4f347 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -322,7 +322,20 @@ NETDEVICE_SHOW_RW(flags, fmt_hex);
 
 static int change_tx_queue_len(struct net_device *dev, unsigned long new_len)
 {
-       dev->tx_queue_len = new_len;
+       int res, orig_len = dev->tx_queue_len;
+
+       if (new_len != orig_len) {
+               dev->tx_queue_len = new_len;
+               res = call_netdevice_notifiers(NETDEV_CHANGE_TX_QUEUE_LEN, dev);
+               res = notifier_to_errno(res);
+               if (res) {
+                       netdev_err(dev,
+                                  "refused to change device tx_queue_len\n");
+                       dev->tx_queue_len = orig_len;
+                       return -EFAULT;
+               }
+       }
+
        return 0;
 }