On 10/12/2016 11:54 AM, Kalle Valo wrote:
Larry Finger <larry.fin...@lwfinger.net> writes:

In commit d86e64768859 ("rtlwifi: rtl818x: constify local structures"),
the configuration struct for most of the drivers was changed to be
constant. The problem is that five of the modified drivers need to be
able to update the firmware name based on the exact model of the card.
As the file names were stored in one of the members of that struct,
these drivers would fail with a kernel BUG splat when they tried to
update the firmware name.

Rather than reverting the previous commit, I used a suggestion by
Johannes Berg and made the firmware file name pointers be local to
the routines that update the software variables.

The configuration struct of rtl8192cu, which was not touched in the
previous patch, is now constantfied.

Fixes: d86e64768859 ("rtlwifi: rtl818x: constify local structures")
Suggested-by: Johannes Berg <johan...@sipsolutions.net>
Signed-off-by: Larry Finger <larry.fin...@lwfinger.net>
Cc: Stable [4.8+] <sta...@vger.kernel.org>
Cc: Julia Lawall <julia.law...@lip6.fr>

I got warnings and after a quick look they look valid but not sure:

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c: In function 
'rtl92c_init_sw_vars':
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c:179:6: warning: 'fw_name' 
may be used uninitialized in this function [-Wuninitialized]
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c: In function 
'rtl8723e_init_sw_vars':
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c:187:6: warning: 'fw_name' 
may be used uninitialized in this function [-Wuninitialized]

(Sending manually for the second time as I don't see my first mail
anywhere.)

Kalle,

I did receive the first one. My compiler failed to show that warning, but I have modified the patch to fix the warnings you see. In fact, the new version is a bit cleaner in that "if () ... else if () ..." constructions are replaced by simple if statements.

V2 will be sent shortly.

Larry


Reply via email to