Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / drivers / net / wireless / ath / wil6210 / netdev.c

diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
index 56aaa2d..ecc3c1b 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2016 Qualcomm Atheros, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -108,8 +108,9 @@ static int wil6210_netdev_poll_tx(struct napi_struct *napi, int budget)
        /* always process ALL Tx complete, regardless budget - it is fast */
        for (i = 0; i < WIL6210_MAX_TX_RINGS; i++) {
                struct vring *vring = &wil->vring_tx[i];
+               struct vring_tx_data *txdata = &wil->vring_tx_data[i];
 
-               if (!vring->va)
+               if (!vring->va || !txdata->enabled)
                        continue;
 
                tx_done += wil_tx_complete(wil, i);