diff options
author | Dan Williams <dcbw@redhat.com> | 2008-08-21 17:51:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-29 16:24:07 -0400 |
commit | d5db2dfa660de13c3643149b89c7602dd49aa168 (patch) | |
tree | c2dbf5cbd27a83c73cba68f4285d1e51024d168f /drivers/net/wireless/libertas/host.h | |
parent | 191bb40e725304c5fcfabd92c57eef58799f0e25 (diff) |
libertas: convert CMD_802_11_RADIO_CONTROL to a direct command
and return errors for operations like join & scan that aren't possible
when the radio is turned off.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/host.h')
-rw-r--r-- | drivers/net/wireless/libertas/host.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h index caebb9b5715b..da618fc997ce 100644 --- a/drivers/net/wireless/libertas/host.h +++ b/drivers/net/wireless/libertas/host.h | |||
@@ -152,11 +152,6 @@ | |||
152 | #define CMD_ACT_MAC_ALL_MULTICAST_ENABLE 0x0100 | 152 | #define CMD_ACT_MAC_ALL_MULTICAST_ENABLE 0x0100 |
153 | #define CMD_ACT_MAC_STRICT_PROTECTION_ENABLE 0x0400 | 153 | #define CMD_ACT_MAC_STRICT_PROTECTION_ENABLE 0x0400 |
154 | 154 | ||
155 | /* Define action or option for CMD_802_11_RADIO_CONTROL */ | ||
156 | #define CMD_TYPE_AUTO_PREAMBLE 0x0001 | ||
157 | #define CMD_TYPE_SHORT_PREAMBLE 0x0002 | ||
158 | #define CMD_TYPE_LONG_PREAMBLE 0x0003 | ||
159 | |||
160 | /* Event flags for CMD_802_11_SUBSCRIBE_EVENT */ | 155 | /* Event flags for CMD_802_11_SUBSCRIBE_EVENT */ |
161 | #define CMD_SUBSCRIBE_RSSI_LOW 0x0001 | 156 | #define CMD_SUBSCRIBE_RSSI_LOW 0x0001 |
162 | #define CMD_SUBSCRIBE_SNR_LOW 0x0002 | 157 | #define CMD_SUBSCRIBE_SNR_LOW 0x0002 |
@@ -165,13 +160,9 @@ | |||
165 | #define CMD_SUBSCRIBE_RSSI_HIGH 0x0010 | 160 | #define CMD_SUBSCRIBE_RSSI_HIGH 0x0010 |
166 | #define CMD_SUBSCRIBE_SNR_HIGH 0x0020 | 161 | #define CMD_SUBSCRIBE_SNR_HIGH 0x0020 |
167 | 162 | ||
168 | #define TURN_ON_RF 0x01 | 163 | #define RADIO_PREAMBLE_LONG 0x00 |
169 | #define RADIO_ON 0x01 | 164 | #define RADIO_PREAMBLE_SHORT 0x02 |
170 | #define RADIO_OFF 0x00 | 165 | #define RADIO_PREAMBLE_AUTO 0x04 |
171 | |||
172 | #define SET_AUTO_PREAMBLE 0x05 | ||
173 | #define SET_SHORT_PREAMBLE 0x03 | ||
174 | #define SET_LONG_PREAMBLE 0x01 | ||
175 | 166 | ||
176 | /* Define action or option for CMD_802_11_RF_CHANNEL */ | 167 | /* Define action or option for CMD_802_11_RF_CHANNEL */ |
177 | #define CMD_OPT_802_11_RF_CHANNEL_GET 0x00 | 168 | #define CMD_OPT_802_11_RF_CHANNEL_GET 0x00 |