Skip to content

Commit

Permalink
ntb_netdev: remove tx timeout
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jon Mason authored and Greg Kroah-Hartman committed Jan 20, 2013
1 parent 765ccc7 commit d723485
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions drivers/net/ntb_netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
}

Expand Down Expand Up @@ -270,18 +266,11 @@ static int ntb_netdev_change_mtu(struct net_device *ndev, int new_mtu)
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,
};

Expand Down

0 comments on commit d723485

Please sign in to comment.