staging: prima: update to 3.2.6.136 (aee0452684)

Squashed commit of the following:
aee0452684 wlan:Revision 3.2.6.136
f8836bce92 Merge "wlan:Revision 3.2.6.135"
5a3a1000fb wlan:Revision 3.2.6.135
93ca13a958 Merge "wlan : Revision 3.2.6.134"
92e7563249 Merge "wlan: ARGENTINA CountryCode should be 'AR' in csrApiScan.c"
d85684a22f Merge "Fix: Kernel panic due to unregistered timer callback invoked"
335b5e9083 Merge "wlan: Logging enhancements for Scan."
5678d155f4 wlan : Revision 3.2.6.134
4cc13c33c2 wlan: ARGENTINA CountryCode should be 'AR' in csrApiScan.c
d648e47d0c Fix: Kernel panic due to unregistered timer callback invoked
3d3a57db4a wlan: Logging enhancements for Scan.
cd675b4747 Merge "WLAN: Fix memory leaks during get BSS Descriptor IE's"
02d3b4d08b Merge "wlan:Revision 3.2.6.132"
b8234d8116 wlan:Revision 3.2.6.132
9ea1f87e77 Merge "wlan: remove obsolete platform-specific code"
600fc19cbb Merge "wlan:Revision 3.2.6.131"
eb3952ee4f Merge "wlan:  Modify the debug log level to Info."
9212c88360 Merge "wlan: Dynamically enable/disable strict FCC Regulatory Rule."
d17108c041 wlan:Revision 3.2.6.131
24004925b7 wlan:  Modify the debug log level to Info.
8f02a196b5 WLAN: Fix memory leaks during get BSS Descriptor IE's
60d8bff434 wlan: Dynamically enable/disable strict FCC Regulatory Rule.
df0ca7397c wlan: remove obsolete platform-specific code
fe75b40d6a Merge "wlan: Memory leak in cfg80211"
abedd4e19e Merge "wlan:Revision 3.2.6.129"
10b5549505 Merge "wlan: Ignore broadcast mac address to get connected staId."
2955beed1b wlan:Revision 3.2.6.129
99b4469b79 wlan: Memory leak in cfg80211
a559d0c9c4 Merge "wlan:Revision 3.2.6.128"
20599a446b Merge "wlan:  Modify the debug log level to Info."
60b7d9204d Merge "wlan:SAP:Configure SAP country code through the gAPCntryCode"
3adf46c96c Merge "wlan: Added ioctl to enable/disable Traffic Monitor Feature Dynamically"
bec43a31f1 wlan:Revision 3.2.6.128
4e38a1010f Merge "wlan: Fix race condition for reliable delivery of action frames."
fd70076206 Merge "wlan:Revision 3.2.6.127"
848e9566fb Merge "wlan:Fix for BD rates in STA mode for probe request"
e53abc24e9 Merge "wlan: FTM second start crash fix."
5f022db71c wlan: Added ioctl to enable/disable Traffic Monitor Feature Dynamically
587aba0afb wlan:  Modify the debug log level to Info.
182d576df6 Merge "wlan: Updating the Channel list based on 11d from Nv.bin."
930ec19db1 Merge "wlan: Fix for the Multicast packet filter failure at P2P CLI interface"
456af6de6b wlan:Revision 3.2.6.127
b555e68b65 wlan:SAP:Configure SAP country code through the gAPCntryCode
f5d5cfd9f3 wlan: Fix for the Multicast packet filter failure at P2P CLI interface
2c143905bc Merge "WLAN: Made host interface file in sync with RIVA."
5d989ef14f wlan:Fix for BD rates in STA mode for probe request
1c301366fb wlan: FTM second start crash fix.
4114a68aed Merge "wlan: add a separate mutex lock for each packet list"
ce776125c0 wlan: Updating the Channel list based on 11d from Nv.bin.
541be9fd55 wlan: Fix race condition for reliable delivery of action frames.
6abffe248c WLAN: Made host interface file in sync with RIVA.
f02874738b wlan: add a separate mutex lock for each packet list
bac23301e9 Merge "wlan : Revision 3.2.6.125"
10138820d4 Merge "TDLS : Protect the Adapter access with a mutex."
a1288d3adb wlan : Revision 3.2.6.125
ce6316bc63 Merge "wlan: Fix for FTM mode spin lock crash"
6beb1476e5 Merge "TDLS: Move tdls_lock to HDD Context"
db1c83f21a Merge "wlan: Disable channel 120,124,128 for ARGENTINA"
75b717370a Merge "wlan: Place DHCP packets in VOICE queue on low resource condition."
c4f1562410 Merge "wlan:Revision 3.2.6.124"
2d36b8dee0 TDLS : Protect the Adapter access with a mutex.
62415c9271 Merge "wlan: Allow builds to work in releases beyond JB"
ea4350add5 TDLS: Move tdls_lock to HDD Context
11606cf5b3 wlan: Fix for FTM mode spin lock crash
ce7b6f41a5 wlan: Ignore broadcast mac address to get connected staId.
099737e3f8 Merge "wlan: Initialize memory allocated for PNO request."
30c8242ca5 wlan:Revision 3.2.6.124
e7bc9eadbb wlan: Allow builds to work in releases beyond JB
9d20723465 Merge "wlan: Error when using private wlan ioctls 'setMaxTxPower'"
1195f24445 Merge "wlan: A method by which metrics related to roaming can be reported"
8107be16a2 Merge "wlan: Do not check for mcbc flag to resume."
1c133ec752 Merge "wlan: Align PNO channels buffer size of WDI with MAC."
522552df0e Merge "Adding support for SIOCGIWMODE for hostapd (SoftAP)."
be6d76d81c wlan: Disable channel 120,124,128 for ARGENTINA
af56c1733c wlan: Place DHCP packets in VOICE queue on low resource condition.
b98094ed1e wlan: Error when using private wlan ioctls 'setMaxTxPower'
d0e62ecf0f wlan: A method by which metrics related to roaming can be reported
20a398629a Adding support for SIOCGIWMODE for hostapd (SoftAP).
02c5b68551 Merge "wlan: Revision 3.2.6.122"
cb38314474 Merge "wlan: Fix race conditions while configuring mc/bc filter"
401de7cf5d Merge "Configurig WLAN/BT interval of BTC as tunable parameters from host"
4da972a36f Merge "wlan: Interface file changes to configurig WLAN/BT interval."
f061c08a7d wlan: Revision 3.2.6.122
70e6af5bfc wlan: Interface file changes to configurig WLAN/BT interval.
2a6ec1fec5 wlan: Do not check for mcbc flag to resume.
54a436907f Merge "wlan : Revision 3.2.6.121"
2c1b869e2b wlan: Fix race conditions while configuring mc/bc filter
6c7171a300 Configurig WLAN/BT interval of BTC as tunable parameters from host
a47136acdb wlan: Initialize memory allocated for PNO request.
d0f0d8adc0 wlan: Align PNO channels buffer size of WDI with MAC.

Change-Id: Ia05af2bc944542e3fc7076f2dbb5c6fe28473b09
staging: prima: update to 3.2.7.13 (79fe26b50a)

Squashed commit of the following:
79fe26b50a wlan:Revision 3.2.7.13
c5c9e34ca4 Merge "wlan: Don't process queued max/min channel timeout after abort scan"
39a5f447c8 Merge "wlan: Process user hints for regulatory change in driver"
3212e3c9dc Merge "wlan: Priority to country in .ini over country in hostapd.conf"
8db85940f8 Merge "wlan: debug enahnacement for umac"
5c231aa1cb Merge "wlan:  Modify the debug log level to Info."
2bd753f700 wlan: Process user hints for regulatory change in driver
0ffe58f29f wlan: Don't process queued max/min channel timeout after abort scan
627b6d6ae6 wlan: debug enahnacement for umac
a17fb443a2 Merge "wlan: DroidSec: String handling and input validation issues"
ad9876eb65 wlan: DroidSec: String handling and input validation issues
4856a6fed6 Merge "wlan: low throughput regression fix"
69ca97c724 wlan:  Modify the debug log level to Info.
95c9894267 wlan: low throughput regression fix
ef81f9bc2a Merge "wlan: Non-sec wd bark due to  excessive logging"
0fba7405b8 Merge "wlan: Static source code analysis fix for HDD"
8e78d25e99 Merge "wlan: Do not flush the entire work items"
69f2eb21ba Merge "wlan:Revision 3.2.7.9"
94de07fbad Merge "wlan: Fix buffer Overread in hdd_ioctl"
38dbc780cc Merge "wlan: Configure PNO Feature support through ini"
574e536847 wlan: Static source code analysis fix for HDD
ce0c39f613 wlan: Non-sec wd bark due to  excessive logging
09cb0c9915 wlan:Revision 3.2.7.9
fadc1adbcc wlan: Fix buffer Overread in hdd_ioctl
738cb16491 wlan: Priority to country in .ini over country in hostapd.conf
9dcc85df48 wlan: Do not flush the entire work items
5d7cff3eca Merge "wlan: SoftAP does not work in 802.11b mode"
1c295eb0bb wlan: Configure PNO Feature support through ini
6fe04abfe3 wlan: SoftAP does not work in 802.11b mode
09a602d285 Merge "wlan:Incorrect 11n link rate displayed on GUI"
ac3a268e50 Merge "wlan: DroidSec: String handling and input validation issues"
27a89d5198 wlan: DroidSec: String handling and input validation issues
48d4f49391 wlan:Incorrect 11n link rate displayed on GUI
fad3266b26 Merge "wlan: 11d Channel list is empty."
8e7107daf2 Merge "wlan: P2P IE needs to be added for the non-P2P station interface."
7bf5351f45 Merge "wlan: ARGENTINA CountryCode should be 'AR' in csrApiScan.c"
a72dc48b8f wlan: 11d Channel list is empty.
bb9ce550be wlan: P2P IE needs to be added for the non-P2P station interface.
0ff05c346d wlan: ARGENTINA CountryCode should be 'AR' in csrApiScan.c
ad20bc9832 Merge "DroidSec:Unsafe access to user space memory from kernel"
a22b4d2411 Merge "wlan:Revision 3.2.7.6"
9345fcd8b2 wlan:Revision 3.2.7.6
e5740727a9 DroidSec:Unsafe access to user space memory from kernel
a26d4696be Merge "wlan : Revision 3.2.7.4"
eaf57709c3 Merge "Logging enhancement in Connect/Disconnect path."
d99e5e9291 Merge "Fix: Kernel panic due to unregistered timer callback invoked"
74c41629c2 Merge "wlan: Logging enhancements for Scan."
b94ceacd73 Merge "wlan : rrm : Incorrect Tx power values in Measurement report"
a78fb35ad9 Merge "Wlan: Enable/Disable dynamic split scan"
343febdb7d wlan : Revision 3.2.7.4
faff073807 Logging enhancement in Connect/Disconnect path.
7d4cba46b0 Fix: Kernel panic due to unregistered timer callback invoked
f152c02c6f Wlan: Enable/Disable dynamic split scan
d13dd956f2 wlan: Logging enhancements for Scan.
c680199564 wlan : rrm : Incorrect Tx power values in Measurement report
e54819328c Merge "Remove AOSP reference to utils.mk"
a424f44c73 Merge "wlan:Revision 3.2.7.3"
136a0a105a Merge "TDLS: Fix for using 11ac vh20 mode in 2.4GHz"
0a1b9200ab Merge "wlan: Dynamic configuration of VHT support in 2.4 GHz band"
0a8445fd8b wlan:Revision 3.2.7.3
66c84feeb7 Remove AOSP reference to utils.mk
b40ef84106 Merge "wlan:Revision 3.2.7.002"
b679ced78d Merge "wlan: Initilize country IE prefrence flag"
01afdd7f4d Merge "wlan: Ignore broadcast mac address to get connected staId."
dd27bf46d5 Merge "wlan: Logging enhancements in SME and PE"
9381f6088b Merge "wlan: Dynamically enable/disable strict FCC Regulatory Rule."
86b991d2cb Merge "P2P: Increase the dwell time for p2p scan with specific SSID"
1922d195b6 TDLS: Fix for using 11ac vh20 mode in 2.4GHz
07100002a9 wlan: Dynamic configuration of VHT support in 2.4 GHz band
b45b7aa217 Merge "wlan: remove obsolete platform-specific code"
c3fc80810b wlan:Revision 3.2.7.002
31013883b5 wlan: remove obsolete platform-specific code
73cad0efa1 Merge "wlan:Revision 3.2.7.001"
a9aff4e9b8 Merge "wlan : rrm : Passive Scan with Beacon Report Request"
d4ff33764e Merge "wlan: rrm: Add support for multiple Beacon reports per channel"
81ec4f1e61 Merge "WLAN: Fix memory leaks during get BSS Descriptor IE's."
731978da4e wlan: Initilize country IE prefrence flag
5637674796 wlan:Revision 3.2.7.001
ffdb5499aa wlan: Ignore broadcast mac address to get connected staId.
79e3f210cd wlan: Logging enhancements in SME and PE
cbe0d5e815 wlan: Dynamically enable/disable strict FCC Regulatory Rule.
e8a59913a7 Merge "wlan: Memory leak in cfg80211"
284ef12d36 P2P: Increase the dwell time for p2p scan with specific SSID
d7521cbe52 wlan: rrm: Add support for multiple Beacon reports per channel
68bb159b07 wlan : rrm : Passive Scan with Beacon Report Request
fd30d8918a WLAN: Fix memory leaks during get BSS Descriptor IE's.
0dbefaade4 wlan: Memory leak in cfg80211

Change-Id: Iac94daeeef610f92c0a2aea634be2082654d18bc
cfg80211: add flags to define country IE processing rules

802.11 cards may have different country IE parsing behavioural
preferences and vendors may want to support these. These preferences
were managed by the WIPHY_FLAG_CUSTOM_REGULATORY and the
WIPHY_FLAG_STRICT_REGULATORY flags and their combination.
Instead of using this existing notation, split out the country IE
behavioural preferences to a new flag. This will allow us to add more
customizations easily and make the code more maintainable. Also add
a new flag to disable country IE hints issued by the CORE as the
first customization.

Change-Id: I66ba4a92ac0f029a115eea0a274b02db11279787
CRs-Fixed: 542802
Signed-off-by: Mihir Shete <smihir@codeaurora.org>

Conflicts:
	net/wireless/reg.c