1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index 835c902b84c1..7ad4e5328439 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2017 Qualcomm Atheros, Inc.
- * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -162,7 +162,7 @@ static int ring_show(struct seq_file *s, void *data)
 
                         snprintf(name, sizeof(name), "tx_%2d", i);
 
-                        if (cid < WIL6210_MAX_CID)
+                        if (cid < max_assoc_sta)
                                 seq_printf(s,
                                            "\n%pM CID %d TID %d 1x%s BACK([%u] %u TU A%s) [%3d|%3d] idle %s\n",
                                            wil->sta[cid].addr, cid, tid,
@@ -792,14 +792,14 @@ static ssize_t wil_write_back(struct file *file, const char __user *buf,
                                 "BACK: del_rx require at least 2 params\n");
                         return -EINVAL;
                 }
-                if (p1 < 0 || p1 >= WIL6210_MAX_CID) {
+                if (p1 < 0 || p1 >= max_assoc_sta) {
                         wil_err(wil, "BACK: invalid CID %d\n", p1);
                         return -EINVAL;
                 }
                 if (rc < 4)
                         p3 = WLAN_REASON_QSTA_LEAVE_QBSS;
                 sta = &wil->sta[p1];
-                wmi_delba_rx(wil, sta->mid, mk_cidxtid(p1, p2), p3);
+                wmi_delba_rx(wil, sta->mid, p1, p2, p3);
         } else {
                 wil_err(wil, "BACK: Unrecognized command \"%s\"\n", cmd);
                 return -EINVAL;
@@ -1243,7 +1243,7 @@ static int bf_show(struct seq_file *s, void *data)
 
         memset(&reply, 0, sizeof(reply));
 
-        for (i = 0; i < ARRAY_SIZE(wil->sta); i++) {
+        for (i = 0; i < max_assoc_sta; i++) {
                 u32 status;
 
                 cmd.cid = i;
@@ -1340,7 +1340,7 @@ static int link_show(struct seq_file *s, void *data)
         if (!sinfo)
                 return -ENOMEM;
 
-        for (i = 0; i < ARRAY_SIZE(wil->sta); i++) {
+        for (i = 0; i < max_assoc_sta; i++) {
                 struct wil_sta_info *p = &wil->sta[i];
                 char *status = "unknown";
                 struct wil6210_vif *vif;
@@ -1542,7 +1542,7 @@ __acquires(&p->tid_rx_lock) __releases(&p->tid_rx_lock)
         struct wil6210_priv *wil = s->private;
         int i, tid, mcs;
 
-        for (i = 0; i < ARRAY_SIZE(wil->sta); i++) {
+        for (i = 0; i < max_assoc_sta; i++) {
                 struct wil_sta_info *p = &wil->sta[i];
                 char *status = "unknown";
                 u8 aid = 0;
@@ -1651,7 +1651,7 @@ __acquires(&p->tid_rx_lock) __releases(&p->tid_rx_lock)
         struct wil6210_priv *wil = s->private;
         int i, bin;
 
-        for (i = 0; i < ARRAY_SIZE(wil->sta); i++) {
+        for (i = 0; i < max_assoc_sta; i++) {
                 struct wil_sta_info *p = &wil->sta[i];
                 char *status = "unknown";
                 u8 aid = 0;
@@ -1740,7 +1740,7 @@ static ssize_t wil_tx_latency_write(struct file *file, const char __user *buf,
                 size_t sz = sizeof(u64) * WIL_NUM_LATENCY_BINS;
 
                 wil->tx_latency_res = val;
-                for (i = 0; i < ARRAY_SIZE(wil->sta); i++) {
+                for (i = 0; i < max_assoc_sta; i++) {
                         struct wil_sta_info *sta = &wil->sta[i];
 
                         kfree(sta->tx_latency_bins);
@@ -1825,7 +1825,7 @@ static void wil_link_stats_debugfs_show_vif(struct wil6210_vif *vif,
         }
 
         seq_printf(s, "TSF %lld\n", vif->fw_stats_tsf);
-        for (i = 0; i < ARRAY_SIZE(wil->sta); i++) {
+        for (i = 0; i < max_assoc_sta; i++) {
                 if (wil->sta[i].status == wil_sta_unused)
                         continue;
                 if (wil->sta[i].mid != vif->mid)
@@ -2386,6 +2386,7 @@ static const struct dbg_off dbg_statics[] = {
         {"led_polarity", 0644, (ulong)&led_polarity, doff_u8},
         {"status_index", 0644, (ulong)&dbg_status_msg_index, doff_u32},
         {"sring_index", 0644, (ulong)&dbg_sring_index, doff_u32},
+        {"drop_if_ring_full", 0644, (ulong)&drop_if_ring_full, doff_u8},
         {},
 };
 
@@ -2439,7 +2440,7 @@ void wil6210_debugfs_remove(struct wil6210_priv *wil)
         wil->debug = NULL;
 
         kfree(wil->dbg_data.data_arr);
-        for (i = 0; i < ARRAY_SIZE(wil->sta); i++)
+        for (i = 0; i < max_assoc_sta; i++)
                 kfree(wil->sta[i].tx_latency_bins);
 
         /* free pmc memory without sending command to fw, as it will