diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/sd8897/Kconfig | 3 | ||||
-rw-r--r-- | drivers/net/wireless/sd8897/Makefile | 7 | ||||
-rw-r--r-- | drivers/net/wireless/sd8897/mlinux/moal_main.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/sd8897/mlinux/moal_main.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/sd8897/mlinux/moal_sdio.h | 6 |
5 files changed, 16 insertions, 10 deletions
diff --git a/drivers/net/wireless/sd8897/Kconfig b/drivers/net/wireless/sd8897/Kconfig index 3d5ffae84ba1..640bc7abe953 100644 --- a/drivers/net/wireless/sd8897/Kconfig +++ b/drivers/net/wireless/sd8897/Kconfig @@ -6,6 +6,9 @@ config SD8897 This module adds support for wireless adapters based on Marvel 8897 chipset. + Say Y here to compile support for sd8897 support into the kernel + or say M to compile it as module. + config SD8897_STA_SUPPORT depends on SD8897 bool "WLAN station support" diff --git a/drivers/net/wireless/sd8897/Makefile b/drivers/net/wireless/sd8897/Makefile index f01846768d1b..e64af7bd7edf 100644 --- a/drivers/net/wireless/sd8897/Makefile +++ b/drivers/net/wireless/sd8897/Makefile @@ -238,11 +238,14 @@ MOALOBJS += mlinux/moal_proc.o MOALOBJS += mlinux/moal_debug.o endif -obj-m := sd8897mlan.o +obj-$(CONFIG_SD8897) := sd8897mlan.o sd8897mlan-objs := $(MLANOBJS) MOALOBJS += mlinux/moal_sdio_mmc.o -obj-m += sd8897.o +obj-$(CONFIG_SD8897) += sd8897.o sd8897-objs := $(MOALOBJS) +ifeq ($(CONFIG_SD8897),m) + EXTRA_LDFLAGS += --strip-debug +endif ############################################################### # End of file diff --git a/drivers/net/wireless/sd8897/mlinux/moal_main.c b/drivers/net/wireless/sd8897/mlinux/moal_main.c index 3affe14fe46b..7ce3242df930 100644 --- a/drivers/net/wireless/sd8897/mlinux/moal_main.c +++ b/drivers/net/wireless/sd8897/mlinux/moal_main.c @@ -171,7 +171,7 @@ int hw_test; #if defined(WIFI_DIRECT_SUPPORT) #if defined(STA_CFG80211) && defined(UAP_CFG80211) #if LINUX_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION -int p2p_enh; +int p2p_enh = 1; #endif #endif #endif @@ -218,7 +218,7 @@ static mlan_callbacks woal_callbacks = { #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) #if defined(WIFI_DIRECT_SUPPORT) -int drv_mode = (DRV_MODE_STA | DRV_MODE_UAP | DRV_MODE_WIFIDIRECT); +int drv_mode = (DRV_MODE_STA | DRV_MODE_WIFIDIRECT); #else int drv_mode = (DRV_MODE_STA | DRV_MODE_UAP); #endif @@ -2087,7 +2087,7 @@ woal_add_interface(moal_handle * handle, t_u8 bss_index, t_u8 bss_type) if (sta_name) snprintf(name, sizeof(name), "%s%%d", sta_name); else - sprintf(name, "mlan%%d"); + sprintf(name, "wlan%%d"); if ((bss_type == MLAN_BSS_TYPE_STA) && (dev_alloc_name(dev, name) < 0)) { PRINTM(MERROR, "Could not allocate mlan device name\n"); goto error; @@ -2109,7 +2109,7 @@ woal_add_interface(moal_handle * handle, t_u8 bss_index, t_u8 bss_type) if (wfd_name) snprintf(name, sizeof(name), "%s%%d", wfd_name); else - sprintf(name, "wfd%%d"); + sprintf(name, "p2p%%d"); if ((bss_type == MLAN_BSS_TYPE_WIFIDIRECT) && (dev_alloc_name(dev, name) < 0)) { PRINTM(MERROR, "Could not allocate wifidirect device name\n"); diff --git a/drivers/net/wireless/sd8897/mlinux/moal_main.h b/drivers/net/wireless/sd8897/mlinux/moal_main.h index 1e824e346929..97a1d5db2bff 100644 --- a/drivers/net/wireless/sd8897/mlinux/moal_main.h +++ b/drivers/net/wireless/sd8897/mlinux/moal_main.h @@ -726,7 +726,7 @@ typedef struct _wait_queue { /** Default WIFIDIRECT BSS */ #define DEF_WIFIDIRECT_BSS 1 #if defined(STA_CFG80211) && defined(UAP_CFG80211) -#define DEF_VIRTUAL_BSS 0 +#define DEF_VIRTUAL_BSS 1 #endif #endif /* WIFI_DIRECT_SUPPORT && V14_FEATURE */ diff --git a/drivers/net/wireless/sd8897/mlinux/moal_sdio.h b/drivers/net/wireless/sd8897/mlinux/moal_sdio.h index 6013a354753d..b05ec157e60a 100644 --- a/drivers/net/wireless/sd8897/mlinux/moal_sdio.h +++ b/drivers/net/wireless/sd8897/mlinux/moal_sdio.h @@ -52,7 +52,7 @@ Change log: #ifdef STA_SUPPORT /** Default firmware name */ -#define DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin" +#define DEFAULT_FW_NAME "sd8897_uapsta.bin" #ifndef DEFAULT_FW_NAME #define DEFAULT_FW_NAME "" @@ -62,7 +62,7 @@ Change log: #ifdef UAP_SUPPORT /** Default firmware name */ -#define DEFAULT_AP_FW_NAME "mrvl/sd8897_uapsta.bin" +#define DEFAULT_AP_FW_NAME "sd8897_uapsta.bin" #ifndef DEFAULT_AP_FW_NAME #define DEFAULT_AP_FW_NAME "" @@ -71,7 +71,7 @@ Change log: /** Default firmaware name */ -#define DEFAULT_AP_STA_FW_NAME "mrvl/sd8897_uapsta.bin" +#define DEFAULT_AP_STA_FW_NAME "sd8897_uapsta.bin" #ifndef DEFAULT_AP_STA_FW_NAME #define DEFAULT_AP_STA_FW_NAME "" |