diff options
| author | Wei Ni <wni@nvidia.com> | 2011-11-22 18:17:43 +0800 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-07-12 08:28:05 -0700 |
| commit | 44713c41b7857936322397eb8f75d14b6e913d4b (patch) | |
| tree | c46978899295e517f718b62419d2062bde2883d1 /net/mac80211/ieee80211_i.h | |
| parent | ddb5f0fe7d694255237edd3576d39247907d4f3a (diff) | |
mac80211 & nl80211: add support to abort a scan request on tx
This fix comes from:
https://gerrit.chromium.org/gerrit/#change,5744
https://gerrit.chromium.org/gerrit/#change,5745
So that it can work with the related wpa_supplicant tool.
BUG=895591
Change-Id: Ie81f6d6052bd45dab13c936f9f0c5f4eb277496a
Original-Signed-off-by: Wei Ni <wni@nvidia.com>
Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Reviewed-on: http://git-master/r/111333
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 9fab144cc9f5..8624f27441f2 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -718,6 +718,10 @@ enum { * about us leaving the channel and stop all associated STA interfaces * @SCAN_ENTER_OPER_CHANNEL: Enter the operating channel again, notify the * AP about us being back and restart all associated STA interfaces + * @SCAN_ABORT: Abnormally terminate the scan operation, set only when + * on the operating channel + * @SCAN_ENTER_OPER_CHANNEL_ABORT: Return to the operating channel then + * terminate the scan operation */ enum mac80211_scan_state { SCAN_DECISION, @@ -725,6 +729,8 @@ enum mac80211_scan_state { SCAN_SEND_PROBE, SCAN_LEAVE_OPER_CHANNEL, SCAN_ENTER_OPER_CHANNEL, + SCAN_ABORT, + SCAN_ENTER_OPER_CHANNEL_ABORT, }; struct ieee80211_local { |