diff options
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/p2p.h')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.h b/drivers/net/wireless/brcm80211/brcmfmac/p2p.h index 0610dcff43fc..0594018a7f9e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.h | |||
@@ -63,7 +63,7 @@ struct p2p_bss { | |||
63 | * @BRCMF_P2P_STATUS_ACTION_TX_COMPLETED: action frame tx completed. | 63 | * @BRCMF_P2P_STATUS_ACTION_TX_COMPLETED: action frame tx completed. |
64 | * @BRCMF_P2P_STATUS_ACTION_TX_NOACK: action frame tx not acked. | 64 | * @BRCMF_P2P_STATUS_ACTION_TX_NOACK: action frame tx not acked. |
65 | * @BRCMF_P2P_STATUS_GO_NEG_PHASE: P2P GO negotiation ongoing. | 65 | * @BRCMF_P2P_STATUS_GO_NEG_PHASE: P2P GO negotiation ongoing. |
66 | * @BRCMF_P2P_STATUS_REMAIN_ON_CHANNEL: P2P listen, remaining on channel. | 66 | * @BRCMF_P2P_STATUS_DISCOVER_LISTEN: P2P listen, remaining on channel. |
67 | */ | 67 | */ |
68 | enum brcmf_p2p_status { | 68 | enum brcmf_p2p_status { |
69 | BRCMF_P2P_STATUS_IF_ADD = 0, | 69 | BRCMF_P2P_STATUS_IF_ADD = 0, |
@@ -74,7 +74,7 @@ enum brcmf_p2p_status { | |||
74 | BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, | 74 | BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, |
75 | BRCMF_P2P_STATUS_ACTION_TX_NOACK, | 75 | BRCMF_P2P_STATUS_ACTION_TX_NOACK, |
76 | BRCMF_P2P_STATUS_GO_NEG_PHASE, | 76 | BRCMF_P2P_STATUS_GO_NEG_PHASE, |
77 | BRCMF_P2P_STATUS_REMAIN_ON_CHANNEL | 77 | BRCMF_P2P_STATUS_DISCOVER_LISTEN |
78 | }; | 78 | }; |
79 | 79 | ||
80 | /** | 80 | /** |
@@ -89,6 +89,7 @@ enum brcmf_p2p_status { | |||
89 | * @ssid: ssid for P2P GO. | 89 | * @ssid: ssid for P2P GO. |
90 | * @listen_channel: channel for @WL_P2P_DISC_ST_LISTEN discover state. | 90 | * @listen_channel: channel for @WL_P2P_DISC_ST_LISTEN discover state. |
91 | * @remain_on_channel: contains copy of struct used by cfg80211. | 91 | * @remain_on_channel: contains copy of struct used by cfg80211. |
92 | * @remain_on_channel_cookie: cookie counter for remain on channel cmd | ||
92 | * @next_af_subtype: expected action frame subtype. | 93 | * @next_af_subtype: expected action frame subtype. |
93 | * @send_af_done: indication that action frame tx is complete. | 94 | * @send_af_done: indication that action frame tx is complete. |
94 | */ | 95 | */ |
@@ -102,6 +103,7 @@ struct brcmf_p2p_info { | |||
102 | struct brcmf_ssid ssid; | 103 | struct brcmf_ssid ssid; |
103 | u8 listen_channel; | 104 | u8 listen_channel; |
104 | struct ieee80211_channel remain_on_channel; | 105 | struct ieee80211_channel remain_on_channel; |
106 | u32 remain_on_channel_cookie; | ||
105 | u8 next_af_subtype; | 107 | u8 next_af_subtype; |
106 | struct completion send_af_done; | 108 | struct completion send_af_done; |
107 | }; | 109 | }; |