Merge ath-next from ath.git

[cascardo/linux.git] / drivers / net / wireless / ath / wil6210 / debugfs.c

diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index a1d10b8..3bbe73b 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.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
@@ -68,13 +68,13 @@ static void wil_print_vring(struct seq_file *s, struct wil6210_priv *wil,
                seq_puts(s, "???\n");
        }
 
-       if (vring->va && (vring->size < 1025)) {
+       if (vring->va && (vring->size <= (1 << WIL_RING_SIZE_ORDER_MAX))) {
                uint i;
 
                for (i = 0; i < vring->size; i++) {
                        volatile struct vring_tx_desc *d = &vring->va[i].tx;
 
-                       if ((i % 64) == 0 && (i != 0))
+                       if ((i % 128) == 0 && (i != 0))
                                seq_puts(s, "\n");
                        seq_printf(s, "%c", (d->dma.status & BIT(0)) ?
                                        _s : (vring->ctx[i].skb ? _h : 'h'));