aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2012-11-14 21:46:09 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-11-16 14:28:49 -0500
commitbdf5ff516b453137cecb71e60ff860ec0a704509 (patch)
tree2e0dca2869b5546623305d9ef1e0c63145d1aba4 /drivers/net/wireless/brcm80211/brcmfmac/dhd.h
parent699b5e5b0ba19b41ddd31ea5dc87d3c5e512342c (diff)
brcmfmac: fix for multiple netdevice interface support
virtual netdevice interface like P2P client and GO need different callbacks for .open and .down. This patch adds those. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd.h')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/dhd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index a41e1c69f8c5..499c5c240e04 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -513,8 +513,6 @@ struct brcmf_pub {
513 struct mutex proto_block; 513 struct mutex proto_block;
514 unsigned char proto_buf[BRCMF_DCMD_MAXLEN]; 514 unsigned char proto_buf[BRCMF_DCMD_MAXLEN];
515 515
516 struct work_struct setmacaddr_work;
517 struct work_struct multicast_work;
518 u8 macvalue[ETH_ALEN]; 516 u8 macvalue[ETH_ALEN];
519 atomic_t pend_8021x_cnt; 517 atomic_t pend_8021x_cnt;
520 wait_queue_head_t pend_8021x_wait; 518 wait_queue_head_t pend_8021x_wait;
@@ -556,6 +554,8 @@ struct brcmf_if {
556 struct brcmf_cfg80211_vif *vif; 554 struct brcmf_cfg80211_vif *vif;
557 struct net_device *ndev; 555 struct net_device *ndev;
558 struct net_device_stats stats; 556 struct net_device_stats stats;
557 struct work_struct setmacaddr_work;
558 struct work_struct multicast_work;
559 int idx; 559 int idx;
560 s32 bssidx; 560 s32 bssidx;
561 u8 mac_addr[ETH_ALEN]; 561 u8 mac_addr[ETH_ALEN];