summaryrefslogtreecommitdiffstats
path: root/drivers/net/ntb_netdev.c
diff options
context:
space:
mode:
authorJon Mason <jon.mason@intel.com>2013-01-19 02:02:32 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-20 15:48:14 -0800
commitd723485cb4ca9eefaf43fd9f165554094b97f2c2 (patch)
tree46cc40cc8d28e7318dc4a9c8e9d163e60a239db2 /drivers/net/ntb_netdev.c
parent765ccc7bc3d913e18b887a86de1e86db701a2d78 (diff)
downloadlinux-d723485cb4ca9eefaf43fd9f165554094b97f2c2.tar.gz
linux-d723485cb4ca9eefaf43fd9f165554094b97f2c2.tar.bz2
linux-d723485cb4ca9eefaf43fd9f165554094b97f2c2.zip
ntb_netdev: remove tx timeout
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>
Diffstat (limited to 'drivers/net/ntb_netdev.c')
-rw-r--r--drivers/net/ntb_netdev.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c
index 28d6fea54384..07c06cdb97b4 100644
--- a/drivers/net/ntb_netdev.c
+++ b/drivers/net/ntb_netdev.c
@@ -144,9 +144,6 @@ static void ntb_netdev_tx_handler(struct ntb_transport_qp *qp, void *qp_data,
}
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,
@@ -166,7 +163,6 @@ static netdev_tx_t ntb_netdev_start_xmit(struct sk_buff *skb,
err:
ndev->stats.tx_dropped++;
ndev->stats.tx_errors++;
- netif_stop_queue(ndev);
return NETDEV_TX_BUSY;
}
@@ -270,18 +266,11 @@ err:
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 = {
.ndo_open = ntb_netdev_open,
.ndo_stop = ntb_netdev_close,
.ndo_start_xmit = ntb_netdev_start_xmit,
.ndo_change_mtu = ntb_netdev_change_mtu,
- .ndo_tx_timeout = ntb_netdev_tx_timeout,
.ndo_set_mac_address = eth_mac_addr,
};