diff options
| author | Wei Ni <wni@nvidia.com> | 2012-11-02 13:40:04 +0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:42:30 -0700 |
| commit | 5839bcf606d928fd080c017a3939abc85adb9ddf (patch) | |
| tree | b28bb29ae0cb9bcf78e55f83b542413666b227d4 /include/uapi | |
| parent | a5d72b0adf7e8aba8a220bf3a5bdf9152f572e5a (diff) | |
mac80211&nl80211: support to abort a scan request on tx
mac80211 & nl80211: add support to abort a scan request on tx
The original issue is the chromium issue:
http://code.google.com/p/chromium-os/issues/detail?id=11485
This fix comes from:
https://gerrit.chromium.org/gerrit/#change,5744
https://gerrit.chromium.org/gerrit/#change,5745
Since this change is for ChromeOs and will affect Android P2P function,
so we add config option MAC80211_SCAN_ABORT for it.
Bug 1051830
Change-Id: I77504f4d279f3f3d99b5e5f9d734480888d62193
Signed-off-by: Wei Ni <wni@nvidia.com>
Reviewed-on: http://git-master/r/160777
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Rhyland Klein <rklein@nvidia.com>
Reviewed-by: Bibhay Ranjan <bibhayr@nvidia.com>
Tested-by: Bibhay Ranjan <bibhayr@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/nl80211.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index d1e48b5e348f..afba28fd4c70 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -1190,6 +1190,8 @@ enum nl80211_commands { * @NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX: Bitmap of antennas which are available * for configuration as RX antennas via the above parameters. * + * @NL80211_ATTR_SCAN_FLAGS: scan request control flags (u32). + * * @NL80211_ATTR_MCAST_RATE: Multicast tx rate (in 100 kbps) for IBSS * * @NL80211_ATTR_OFFCHANNEL_TX_OK: For management frame TX, the frame may be @@ -1616,6 +1618,10 @@ enum nl80211_attrs { NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX, NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX, +#ifdef CONFIG_MAC80211_SCAN_ABORT + NL80211_ATTR_SCAN_FLAGS, +#endif + NL80211_ATTR_SUPPORT_MESH_AUTH, NL80211_ATTR_STA_PLINK_STATE, @@ -3623,11 +3629,13 @@ enum nl80211_connect_failed_reason { * dangerous because will destroy stations performance as a lot of frames * will be lost while scanning off-channel, therefore it must be used only * when really needed + * @NL80211_SCAN_FLAG_TX_ABORT: abort scan if tx collides */ enum nl80211_scan_flags { NL80211_SCAN_FLAG_LOW_PRIORITY = 1<<0, NL80211_SCAN_FLAG_FLUSH = 1<<1, NL80211_SCAN_FLAG_AP = 1<<2, + NL80211_SCAN_FLAG_TX_ABORT = 1<<3, }; /** |