diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-06 17:31:36 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-06 17:31:36 +0200 |
| commit | d2ce98ca0a192e1bcb89068adfe6cb736f5e351c (patch) | |
| tree | 888ccaba7b3e09bf4b81324dff38a65f5667296c /net/core/dev_ioctl.c | |
| parent | 85eae57bbb0612387201635659be543aaac2109e (diff) | |
| parent | d72e90f33aa4709ebecc5005562f52335e106a60 (diff) | |
Merge tag 'v4.18-rc6' into HEAD
Pull bug fixes into the KVM development tree to avoid nasty conflicts.
Diffstat (limited to 'net/core/dev_ioctl.c')
| -rw-r--r-- | net/core/dev_ioctl.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c index a04e1e88bf3a..50537ff961a7 100644 --- a/net/core/dev_ioctl.c +++ b/net/core/dev_ioctl.c @@ -285,16 +285,9 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) if (ifr->ifr_qlen < 0) return -EINVAL; if (dev->tx_queue_len ^ ifr->ifr_qlen) { - unsigned int orig_len = dev->tx_queue_len; - - dev->tx_queue_len = ifr->ifr_qlen; - err = call_netdevice_notifiers( - NETDEV_CHANGE_TX_QUEUE_LEN, dev); - err = notifier_to_errno(err); - if (err) { - dev->tx_queue_len = orig_len; + err = dev_change_tx_queue_len(dev, ifr->ifr_qlen); + if (err) return err; - } } return 0; |