summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lin <dlin@marvell.com>2016-05-23 12:33:41 +0800
committerDavid Lin <dlin@marvell.com>2016-05-23 12:33:41 +0800
commit267c5144165ad7bd8da0e0f897a487b82460e95c (patch)
treecc7fd1532cf42807b498cc9292dac44ef3220976
parent7d49296d12b44025278a52c5a26fb1b4236f320f (diff)
Commit mwlwifi driver 10.3.0.17-20160523
Added code to control the rate to print out check BA related debug messages. Signed-off-by: David Lin <dlin@marvell.com>
-rw-r--r--dev.h2
-rw-r--r--fwcmd.c6
-rw-r--r--mac80211.c6
3 files changed, 9 insertions, 5 deletions
diff --git a/dev.h b/dev.h
index 4c69dcf..37504b9 100644
--- a/dev.h
+++ b/dev.h
@@ -27,7 +27,7 @@
#include <net/mac80211.h>
#define MWL_DRV_NAME KBUILD_MODNAME
-#define MWL_DRV_VERSION "10.3.0.17-20160520-1"
+#define MWL_DRV_VERSION "10.3.0.17-20160523"
/* Map to 0x80000000 (Bus control) on BAR0 */
#define MACREG_REG_H2A_INTERRUPT_EVENTS 0x00000C18 /* (From host to ARM) */
diff --git a/fwcmd.c b/fwcmd.c
index ef24be4..e159304 100644
--- a/fwcmd.c
+++ b/fwcmd.c
@@ -2393,8 +2393,10 @@ int mwl_fwcmd_check_ba(struct ieee80211_hw *hw,
if (pcmd->cmd_hdr.result != 0) {
mutex_unlock(&priv->fwcmd_mutex);
- wiphy_err(hw->wiphy, "check ba result error %d\n",
- le16_to_cpu(pcmd->cmd_hdr.result));
+ if (printk_ratelimit())
+ wiphy_debug(hw->wiphy, "check ba result err %d(%pM)\n",
+ le16_to_cpu(pcmd->cmd_hdr.result),
+ stream->sta->addr);
return -EINVAL;
}
diff --git a/mac80211.c b/mac80211.c
index f15f3cc..47f60c6 100644
--- a/mac80211.c
+++ b/mac80211.c
@@ -649,8 +649,10 @@ static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw,
spin_lock_bh(&priv->stream_lock);
if (rc) {
mwl_fwcmd_remove_stream(hw, stream);
- wiphy_err(hw->wiphy,
- "ampdu start error code: %d\n", rc);
+ if (printk_ratelimit())
+ wiphy_debug(hw->wiphy,
+ "ampdu start error code: %d(%pM)\n",
+ rc, addr);
rc = -EPERM;
break;
}