mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 16:49:22 +00:00
Code Issues Releases Wiki Activity

ntb_netdev: remove tx timeout

Browse source 
There is a race between disabling and enabling the tx queue, resulting
in tx timeouts.  Since all the tx timeout does is re-enable the tx
queue, simple remove the start/stop of the queue and the tx timeout
routine.

Signed-off-by: Jon Mason <jon.mason@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jon Mason 2013-01-19 02:02:32 -07:00 committed by Greg Kroah-Hartman
parent 765ccc7bc3
commit d723485cb4
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/ntb_netdev.c
View file

@ -144,9 +144,6 @@ static void ntb_netdev_tx_handler(struct ntb_transport_qp *qp, void *qp_data,
} }
dev_kfree_skb(skb); dev_kfree_skb(skb);
if (netif_queue_stopped(ndev))
netif_wake_queue(ndev);
} }
static netdev_tx_t ntb_netdev_start_xmit(struct sk_buff *skb, static netdev_tx_t ntb_netdev_start_xmit(struct sk_buff *skb,
@ -166,7 +163,6 @@ static netdev_tx_t ntb_netdev_start_xmit(struct sk_buff *skb,
err: err:
ndev->stats.tx_dropped++; ndev->stats.tx_dropped++;
ndev->stats.tx_errors++; ndev->stats.tx_errors++;
netif_stop_queue(ndev);
return NETDEV_TX_BUSY; return NETDEV_TX_BUSY;
} }
@ -270,18 +266,11 @@ static int ntb_netdev_change_mtu(struct net_device *ndev, int new_mtu)
return rc; return rc;
} }
static void ntb_netdev_tx_timeout(struct net_device *ndev)
{
if (netif_running(ndev))
netif_wake_queue(ndev);
}
static const struct net_device_ops ntb_netdev_ops = { static const struct net_device_ops ntb_netdev_ops = {
.ndo_open = ntb_netdev_open, .ndo_open = ntb_netdev_open,
.ndo_stop = ntb_netdev_close, .ndo_stop = ntb_netdev_close,
.ndo_start_xmit = ntb_netdev_start_xmit, .ndo_start_xmit = ntb_netdev_start_xmit,
.ndo_change_mtu = ntb_netdev_change_mtu, .ndo_change_mtu = ntb_netdev_change_mtu,
.ndo_tx_timeout = ntb_netdev_tx_timeout,
.ndo_set_mac_address = eth_mac_addr, .ndo_set_mac_address = eth_mac_addr,
}; };