shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 20:32:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

net: wireless: bcmdhd: Fix compilation for kernel 3.0

Browse Source 
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Dmitry Shmidt
2011-07-19 09:58:13 -07:00
parent 2f66cb426e
commit a76bd864b3
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/bcmdhd/Makefile
View File

@@ -22,7 +22,7 @@ bcmdhd-objs += wl_iw.o
DHDCFLAGS += -DSOFTAP
endif
ifneq ($(CONFIG_CFG80211),)
bcmdhd-objs += wl_cfg80211.o wl_cfgp2p.o
bcmdhd-objs += wl_cfg80211.o wl_cfgp2p.o dhd_linux_mon.o
DHDCFLAGS += -DWL_CFG80211
endif
EXTRA_CFLAGS = $(DHDCFLAGS)

7
drivers/net/wireless/bcmdhd/wl_cfg80211.c
View File

@@ -6341,7 +6341,6 @@ s32 wl_cfg80211_get_p2p_dev_addr(struct net_device *net, struct ether_addr *p2pd
static __used void wl_dongle_poweron(struct wl_priv *wl)
{
WL_DBG(("Enter \n"));
dhd_customer_gpio_wlan_ctrl(WLAN_RESET_ON);
@@ -6356,10 +6355,12 @@ static __used void wl_dongle_poweron(struct wl_priv *wl)
static __used void wl_dongle_poweroff(struct wl_priv *wl)
{
WL_DBG(("Enter \n"));
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
wl_cfg80211_suspend(wl_to_wiphy(wl), NULL);
#else
wl_cfg80211_suspend(wl_to_wiphy(wl));
#endif
#if defined(BCMLXSDMMC)
sdioh_stop(NULL);