diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-04 15:25:34 (GMT) |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-04 15:25:34 (GMT) |
| commit | 7e935c7ca1e6c398f11edac5beabfc4348e3b3a4 (patch) | |
| tree | 86da864ba6341bd86b5f5450c611f918722237b2 /drivers/net/ethernet/qualcomm | |
| parent | c62432b40b5e03c25faf2c8f8547bba4908b8945 (diff) | |
| parent | e9d408e107db9a554b36c3a79f67b37dd3e16da0 (diff) | |
| download | linux-7e935c7ca1e6c398f11edac5beabfc4348e3b3a4.tar.xz | |
Merge branch 'memdup_user_nul' into work.misc
Diffstat (limited to 'drivers/net/ethernet/qualcomm')
| -rw-r--r-- | drivers/net/ethernet/qualcomm/qca_spi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index ddb2c6c..689a4a5 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -736,9 +736,8 @@ qcaspi_netdev_tx_timeout(struct net_device *dev) netdev_info(qca->net_dev, "Transmit timeout at %ld, latency %ld\n", jiffies, jiffies - dev->trans_start); qca->net_dev->stats.tx_errors++; - /* wake the queue if there is room */ - if (qcaspi_tx_ring_has_space(&qca->txr)) - netif_wake_queue(dev); + /* Trigger tx queue flush and QCA7000 reset */ + qca->sync = QCASPI_SYNC_UNKNOWN; } static int |