projects
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a1a2808
)
net: wireless: bcmdhd: Fix compilation for WEXT
author
Dmitry Shmidt
<dimitrysh@google.com>
Wed, 20 Jul 2011 23:04:45 +0000
(16:04 -0700)
committer
mgross
<mark.gross@intel.com>
Wed, 9 Nov 2011 20:21:51 +0000
(12:21 -0800)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
drivers/net/wireless/bcmdhd/wl_android.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/bcmdhd/wl_android.c
b/drivers/net/wireless/bcmdhd/wl_android.c
index
fa6e305
..
876fc08
100644
(file)
--- a/
drivers/net/wireless/bcmdhd/wl_android.c
+++ b/
drivers/net/wireless/bcmdhd/wl_android.c
@@
-106,7
+106,11
@@
typedef struct android_wifi_priv_cmd {
void dhd_customer_gpio_wlan_ctrl(int onoff);
uint dhd_dev_reset(struct net_device *dev, uint8 flag);
void dhd_dev_init_ioctl(struct net_device *dev);
+#ifdef WL_CFG80211
int wl_cfg80211_get_p2p_dev_addr(struct net_device *net, struct ether_addr *p2pdev_addr);
+#else
+int wl_cfg80211_get_p2p_dev_addr(struct net_device *net, struct ether_addr *p2pdev_addr) { return 0; }
+#endif
extern bool ap_fw_loaded;
#ifdef CUSTOMER_HW2