aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohn Fastabend <john.r.fastabend@intel.com>2010-02-25 18:14:58 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-26 05:10:11 -0500
commita922afb64d2e71115f122e04346163cb8c8453e3 (patch)
tree372eb2450bee03dcd6ca681d691c5e8e5296f6e5 /drivers/net
parent43634e820e393ba48bb2efc3d330dee4203e80d8 (diff)
ixgbe: do not stop tx queues in ixgbe_set_tso
Disabling TSO can cause the dev_watchdog timer to be triggered because when TSO is disabled netif_tx_stop_all_queues is called. If the watchdog timer fires while the queues are stopped and traffic has not recently been sent on a paticular queue this is falsly identified as a hang and ndo_tx_timeout() is called. This is ocossionally seen during testing. This removes the netif_tx_stop_all_queues() it is not needed. The scheduler submits skb's with dev_hard_start_xmit(), this checks if netif_needs_gso and if so it calls dev_gso_segment. Disabling TSO will cause dev_hard_start_xmit() to do the gso processing. However ixgbe does not use the features flags to determine if it needs to use tso or not instead it uses skb->gso_size so ixgbe will process these frames correctly regardless of the netdev features flag. Signed-off-by: John Fastabend <john.r.fastabend@intel.com> Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ixgbe/ixgbe_ethtool.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 0d234346a4ea..7949a446e4c7 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -441,10 +441,8 @@ static int ixgbe_set_tso(struct net_device *netdev, u32 data)
441 netdev->features |= NETIF_F_TSO; 441 netdev->features |= NETIF_F_TSO;
442 netdev->features |= NETIF_F_TSO6; 442 netdev->features |= NETIF_F_TSO6;
443 } else { 443 } else {
444 netif_tx_stop_all_queues(netdev);
445 netdev->features &= ~NETIF_F_TSO; 444 netdev->features &= ~NETIF_F_TSO;
446 netdev->features &= ~NETIF_F_TSO6; 445 netdev->features &= ~NETIF_F_TSO6;
447 netif_tx_start_all_queues(netdev);
448 } 446 }
449 return 0; 447 return 0;
450} 448}