UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging rtl8192e: Declare MODULE_FIRMWARE usage 

Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Mike McCormack <mikem@ring3k.org>
Cc: wlanfae <wlanfae@realtek.com>
Cc: Sean MacLennan <seanm@seanm.ca>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Sean MacLennan <seanm@seanm.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tim Gardner 2012-07-25 13:08:47 -06:00 committed by Greg Kroah-Hartman
parent 1deef918ec
commit 7f34f41289
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
View File

@ -265,9 +265,10 @@ bool init_firmware(struct net_device *dev)
case FW_SOURCE_IMG_FILE: case FW_SOURCE_IMG_FILE:
{ {
if (pfirmware->firmware_buf_size[init_step] == 0) { if (pfirmware->firmware_buf_size[init_step] == 0) {
const char *fw_name[3] = { "RTL8192E/boot.img", const char *fw_name[3] = {
"RTL8192E/main.img", RTL8192E_BOOT_IMG_FW,
"RTL8192E/data.img" RTL8192E_MAIN_IMG_FW,
RTL8192E_DATA_IMG_FW
}; };
const struct firmware *fw_entry; const struct firmware *fw_entry;
int rc; int rc;

4
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
View File

@ -23,6 +23,10 @@
#define GET_COMMAND_PACKET_FRAG_THRESHOLD(v) (4*(v/4) - 8) #define GET_COMMAND_PACKET_FRAG_THRESHOLD(v) (4*(v/4) - 8)
#define RTL8192E_BOOT_IMG_FW "RTL8192E/boot.img"
#define RTL8192E_MAIN_IMG_FW "RTL8192E/main.img"
#define RTL8192E_DATA_IMG_FW "RTL8192E/data.img"
enum firmware_init_step { enum firmware_init_step {
FW_INIT_STEP0_BOOT = 0, FW_INIT_STEP0_BOOT = 0,
FW_INIT_STEP1_MAIN = 1, FW_INIT_STEP1_MAIN = 1,

3
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
View File

@ -3125,6 +3125,9 @@ MODULE_DESCRIPTION("Linux driver for Realtek RTL819x WiFi cards");
MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR); MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
MODULE_VERSION(DRV_VERSION); MODULE_VERSION(DRV_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_FIRMWARE(RTL8192E_BOOT_IMG_FW);
MODULE_FIRMWARE(RTL8192E_MAIN_IMG_FW);
MODULE_FIRMWARE(RTL8192E_DATA_IMG_FW);
module_param(ifname, charp, S_IRUGO|S_IWUSR); module_param(ifname, charp, S_IRUGO|S_IWUSR);
module_param(hwwep, int, S_IRUGO|S_IWUSR); module_param(hwwep, int, S_IRUGO|S_IWUSR);