aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-14 12:50:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-14 12:50:27 -0400
commitd0bbe0dd353af9521e9d8bc5236308c677b6f62a (patch)
treea1142f3a5058d16504863ac777b21efdf1eca49e /drivers/net/wireless/rtlwifi
parent8de29a35dc840a05e451ad035bcb06e21ccf605f (diff)
parent0e4f93e5017d9d8080bbd34db17836e090eb46fe (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Usual trivial tree updates. Nothing outstanding -- mostly printk() and comment fixes and unused identifier removals" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: goldfish: goldfish_tty_probe() is not using 'i' any more powerpc: Fix comment in smu.h qla2xxx: Fix printks in ql_log message lib: correct link to the original source for div64_u64 si2168, tda10071, m88ds3103: Fix firmware wording usb: storage: Fix printk in isd200_log_config() qla2xxx: Fix printk in qla25xx_setup_mode init/main: fix reset_device comment ipwireless: missing assignment goldfish: remove unreachable line of code coredump: Fix do_coredump() comment stacktrace.h: remove duplicate declaration task_struct smpboot.h: Remove unused function prototype treewide: Fix typo in printk messages treewide: Fix typo in printk messages mod_devicetable: fix comment for match_flags
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8723be/dm.c2
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8821ae/dm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
index 2367e8f47a5b..e77c3a46c94a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
@@ -309,7 +309,7 @@ static void rtl8723be_dm_find_minimum_rssi(struct ieee80211_hw *hw)
309 rtl_dm_dig->min_undec_pwdb_for_dm = 309 rtl_dm_dig->min_undec_pwdb_for_dm =
310 rtlpriv->dm.entry_min_undec_sm_pwdb; 310 rtlpriv->dm.entry_min_undec_sm_pwdb;
311 RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD, 311 RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
312 "AP Ext Port or disconnet PWDB = 0x%x\n", 312 "AP Ext Port or disconnect PWDB = 0x%x\n",
313 rtl_dm_dig->min_undec_pwdb_for_dm); 313 rtl_dm_dig->min_undec_pwdb_for_dm);
314 } 314 }
315 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "MinUndecoratedPWDBForDM =%d\n", 315 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "MinUndecoratedPWDBForDM =%d\n",
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
index 0b2082dc48f1..342678d2ed42 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
@@ -873,7 +873,7 @@ static void rtl8821ae_dm_dig(struct ieee80211_hw *hw)
873 873
874 if (rtlpriv->falsealm_cnt.cnt_all > 10000) { 874 if (rtlpriv->falsealm_cnt.cnt_all > 10000) {
875 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, 875 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
876 "Abnornally false alarm case.\n"); 876 "Abnormally false alarm case.\n");
877 877
878 if (dm_digtable->large_fa_hit != 3) 878 if (dm_digtable->large_fa_hit != 3)
879 dm_digtable->large_fa_hit++; 879 dm_digtable->large_fa_hit++;