| Message ID | 20180629204248.28919-1-xiyou.wangcong@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: use dev_change_tx_queue_len() for SIOCSIFTXQLEN | expand |
On 06/29/2018 01:42 PM, Cong Wang wrote: > As noticed by Eric, we need to switch to the helper > dev_change_tx_queue_len() for SIOCSIFTXQLEN call path too, > otheriwse still miss dev_qdisc_change_tx_queue_len(). > > Fixes: 6a643ddb5624 ("net: introduce helper dev_change_tx_queue_len()") > Reported-by: Eric Dumazet <edumazet@google.com> > Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> > --- > Reviewed-by: Eric Dumazet <edumazet@google.com> Thanks !
From: Cong Wang <xiyou.wangcong@gmail.com> Date: Fri, 29 Jun 2018 13:42:48 -0700 > As noticed by Eric, we need to switch to the helper > dev_change_tx_queue_len() for SIOCSIFTXQLEN call path too, > otheriwse still miss dev_qdisc_change_tx_queue_len(). > > Fixes: 6a643ddb5624 ("net: introduce helper dev_change_tx_queue_len()") > Reported-by: Eric Dumazet <edumazet@google.com> > Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Applied.
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;
As noticed by Eric, we need to switch to the helper dev_change_tx_queue_len() for SIOCSIFTXQLEN call path too, otheriwse still miss dev_qdisc_change_tx_queue_len(). Fixes: 6a643ddb5624 ("net: introduce helper dev_change_tx_queue_len()") Reported-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> --- net/core/dev_ioctl.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)