Skip to content

net: wireless: wl12xx: fix broken dependency on Kconfig macros #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rdrjr wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

net: wireless: wl12xx: fix broken dependency on Kconfig macros #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions drivers/net/wireless/wl12xx/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@

#define WL1271_BOOT_RETRIES 3

#if (defined(CONFIG_MACH_PCM049) || defined(CONFIG_MACH_OMAP4_PHENIX) \
|| defined(CONFIG_MACH_KSP5012))
static const int wl12xx_enabled = 1;
#else
static const int wl12xx_enabled = 0;
#endif

static struct conf_drv_settings default_conf = {
.sg = {
.params = {
Expand Down Expand Up @@ -5156,9 +5163,7 @@ static int wl1271_register_hw(struct wl1271 *wl)
}

/* if the MAC address is zeroed in the NVS derive from fuse */
if ((oui_addr == 0 && nic_addr == 0)
|| CONFIG_MACH_PCM049 || CONFIG_MACH_OMAP4_PHENIX) {
// || CONFIG_MACH_KSP5012) {
if ((oui_addr == 0 && nic_addr == 0) || wl12xx_enabled) {
oui_addr = wl->fuse_oui_addr;
/* fuse has the BD_ADDR, the WLAN addresses are the next two */
nic_addr = wl->fuse_nic_addr + 1;
Expand Down