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

Commit b54a28a4 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8712u: Firmware changes for driver 



* select FW_LOADER in Kconfig - From: Stefan Lippers-Hollmann <s.l-h@gmx.de>
* declare MODULE_FIRMWARE for r8712u and change to correct directory
* delete 10K line farray.h containing internal firmware

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c84a7028

drivers/staging/rtl8712/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config R8712U 
	depends on WLAN && USB

	select WIRELESS_EXT

	select WEXT_PRIV

	select FW_LOADER

	default N

	---help---

	This option adds the Realtek RTL8712 USB device such as the D-Link DWA-130.

drivers/staging/rtl8712/farray.h

deleted100644 → 0
+0 −10197

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8712/hal_init.c

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static u32 rtl871x_open_fw(struct _adapter *padapter, void **pphfwfile_hdl, 
		    const u8 **ppmappedfw)

{

	int rc;

	const char firmware_file[] = "rtl8712u/rtl8712u.bin";

	const char firmware_file[] = "rtlwifi/rtl8712u.bin";

	const struct firmware **praw = (const struct firmware **)

				       (pphfwfile_hdl);

	struct dvobj_priv *pdvobjpriv = (struct dvobj_priv *)
@@ -58,6 +58,7 @@ static u32 rtl871x_open_fw(struct _adapter *padapter, void **pphfwfile_hdl, 
	*ppmappedfw = (u8 *)((*praw)->data);

	return (*praw)->size;

}

MODULE_FIRMWARE("rtlwifi/rtl8712u.bin");



static void fill_fwpriv(struct _adapter *padapter, struct fw_priv *pfwpriv)

{