diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-07-19 09:58:13 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-07-21 17:14:14 -0700 |
| commit | a76bd864b3e70e01085276dcc55bd4a0f543dec0 (patch) | |
| tree | 0eec594f21869fa75f5b9aa2e4ebb205e352e837 | |
| parent | 2f66cb426e32ac6c731e4eda09aded204a800d64 (diff) | |
net: wireless: bcmdhd: Fix compilation for kernel 3.0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | drivers/net/wireless/bcmdhd/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_cfg80211.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile index 9f17fa7f25c..9984363f11d 100644 --- a/drivers/net/wireless/bcmdhd/Makefile +++ b/drivers/net/wireless/bcmdhd/Makefile @@ -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) diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 69180b56b42..d0b82ab255b 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -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); |