Revert "mac80211&nl80211: support to abort a scan request on tx"
authorNitin Bindal <nbindal@nvidia.com>
Thu, 25 Oct 2012 12:35:01 +0000 (17:35 +0530)
committerSimone Willett <swillett@nvidia.com>
Thu, 1 Nov 2012 02:15:10 +0000 (19:15 -0700)
commita693da8b6eae7b315221ba0ee895415cf89f44ca
tree46b6da8f2e1f61d1fccef58b9b91e6b318ad4d68
parentcca9dbb7d5c4caf9ffa171a4be7789220bb61fbc
Revert "mac80211&nl80211: support to abort a scan request on tx"

This reverts commit 4ffe2cabbc00d9d12a3884178e3f85aa9f66804c.

This revert fixes p2p connect issue on android.

Bug 1161910
Bug 1059518

Change-Id: I2d10b2cf57fab88ccdfd3d2eca6cdeb36ef9f544
Signed-off-by: Nitin Bindal <nbindal@nvidia.com>
Reviewed-on: http://git-master/r/147584
Reviewed-by: Rakesh Kumar <krakesh@nvidia.com>
Tested-by: Rakesh Kumar <krakesh@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
include/linux/nl80211.h
include/net/cfg80211.h
net/mac80211/ieee80211_i.h
net/mac80211/scan.c
net/wireless/nl80211.c