54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
|
|
index 3771985..b073208 100644
|
|
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
|
|
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
|
|
@@ -228,13 +228,6 @@ bool init_firmware(struct net_device *dev)
|
|
struct r8192_priv *priv = rtllib_priv(dev);
|
|
bool rt_status = true;
|
|
|
|
- u8 *firmware_img_buf[3] = { &Rtl8192PciEFwBootArray[0],
|
|
- &Rtl8192PciEFwMainArray[0],
|
|
- &Rtl8192PciEFwDataArray[0]};
|
|
-
|
|
- u32 firmware_img_len[3] = { sizeof(Rtl8192PciEFwBootArray),
|
|
- sizeof(Rtl8192PciEFwMainArray),
|
|
- sizeof(Rtl8192PciEFwDataArray)};
|
|
u32 file_length = 0;
|
|
u8 *mapped_file = NULL;
|
|
u8 init_step = 0;
|
|
@@ -308,14 +301,6 @@ bool init_firmware(struct net_device *dev)
|
|
file_length = pfirmware->firmware_buf_size[init_step];
|
|
break;
|
|
}
|
|
- case FW_SOURCE_HEADER_FILE:
|
|
- mapped_file = firmware_img_buf[init_step];
|
|
- file_length = firmware_img_len[init_step];
|
|
- if (init_step == FW_INIT_STEP2_DATA) {
|
|
- memcpy(pfirmware->firmware_buf[init_step], mapped_file, file_length);
|
|
- pfirmware->firmware_buf_size[init_step] = file_length;
|
|
- }
|
|
- break;
|
|
|
|
default:
|
|
break;
|
|
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c
|
|
index 08e7dbb..e760397 100644
|
|
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c
|
|
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c
|
|
@@ -20,6 +20,7 @@
|
|
|
|
#include "r8192E_hwimg.h"
|
|
|
|
+#ifdef REMOVE_DFSG
|
|
u8 Rtl8192PciEFwBootArray[BootArrayLengthPciE] = {
|
|
0x10,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x3c,0x08,0xbf,0xc0,0x25,0x08,0x00,0x08,
|
|
0x3c,0x09,0xb0,0x03,0xad,0x28,0x00,0x20,0x40,0x80,0x68,0x00,0x00,0x00,0x00,0x00,
|
|
@@ -2790,6 +2791,7 @@ u8 Rtl8192PciEFwDataArray[DataArrayLengthPciE] = {
|
|
0x80,0x00,0x8f,0xa8,0x80,0x00,0x8f,0xa8,0x80,0x00,0x8f,0xa8,0x80,0x00,0x8f,0xa8,
|
|
0x80,0x00,0x8f,0xd8,0x80,0x00,0x8f,0xec,0x80,0x00,0x90,0x00,0x80,0x00,0x8b,0x88,
|
|
};
|
|
+#endif
|
|
|
|
u32 Rtl8192PciEPHY_REGArray[PHY_REGArrayLengthPciE] = {0x0,};
|
|
|