Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62f01db9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2017-02-06' of... 

Merge tag 'wireless-drivers-for-davem-2017-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 4.10

Only one important fix for rtlwifi which fixes a regression introduced
in 4.9 and which caused problems for many users.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 89389b4d 52f5631a

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c

+7 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));

	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));

	char *fw_name = "rtlwifi/rtl8192cfwU.bin";

	char *fw_name;



	rtl8192ce_bt_reg_init(hw);
@@ -164,8 +164,13 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw) 
	}



	/* request fw */

	if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version))

	if (IS_VENDOR_UMC_A_CUT(rtlhal->version) &&

	    !IS_92C_SERIAL(rtlhal->version))

		fw_name = "rtlwifi/rtl8192cfwU.bin";

	else if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version))

		fw_name = "rtlwifi/rtl8192cfwU_B.bin";

	else

		fw_name = "rtlwifi/rtl8192cfw.bin";



	rtlpriv->max_fw_size = 0x4000;

	pr_info("Using firmware %s\n", fw_name);