Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/ti/wlan into HEAD
wlan: Fix inline building

This fixes inline bulding for devices like ruby
* ifndef'ed mutiple defines
* Fix compiler warning

Change-Id: I3282a93c7a637951792e4270eaabeced7fbd9a7b
WLAN - wl12xx: Update to R5.SP3.06 from R5.SP3.01 package

mac80211: reject BA action frames if sent fron non HT STA
mac80211: warn on enabling beacon while off channel
wl12xx: improve some debug logs
wl12xx: fix list_add/list_del
wl12xx: FW recovery trigger assert bug fix
wl12xx: mutually exclude PLT and normal power modes
wl12xx: check for required fw change while enable or disable role
wl12xx: disable elp sleep while in plt mode
mac80211: purge offchannel Tx on reconfig
wl12xx: Copy FW log as entire mem block
wl12xx: decrease elp timeout to 20ms
wl12xx: triggering FW assert to perform recovery
wl12xx: fix some line spacing
wl12xx: recovery elp_wakeup optimizations
mac80211: purge all pending ROCs on reconfig
wl12xx: block sched scan if p2p client is running
mac80211: increase channel switch request timeout
wl12xx: initialize per-link FW freed blocks correctly
wl12xx: restore default channel configuration
wl12xx: consolidate free_link and always call it
wl12xx: take the mutex before resetting Tx queues
wl12xx: change packet retry count
wl12xx: fix generic cfg fw command

Change-Id: I6df813e1781f5178d9558f7a4b4a70d7900bd6bb
Signed-off-by: Eyal Shapira <eyal@wizery.com>
Signed-off-by: Yossi Wortzel <yossiw@ti.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Victor Goldenshtein <victorg@ti.com>
Signed-off-by: Yair Shapira <yair.shapira@ti.com>
Signed-off-by: Igal Chernobelsky <igalc@ti.com>
Signed-off-by: Ofir Luzon <ofirluzon@ti.com>
Signed-off-by: Panduranga Mallireddy <panduranga_mallireddy@ti.com>
Fix error introduced by copy-paste from Gerrit

The » which Gerrit uses to indicate hard tabs somehow sneaked into the
actual code via http://review.cyanogenmod.org/#/c/34963/.  Take them
out.

Change-Id: I07ceac0159aa787b02a3f383843c19a33a88d791
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1
wlconf: Fix compilation

Fixes the following error:

target thumb C: wlconf <= hardware/ti/wlan/mac80211/ti-utils/wlconf/main.c
hardware/ti/wlan/mac80211/ti-utils/wlconf/main.c:32:16: error: static declaration of 'getline' follows non-static declaration
In file included from hardware/ti/wlan/mac80211/ti-utils/wlconf/main.c:20:0:
bionic/libc/include/stdio.h:228:10: note: previous declaration of 'getline' was here

Change-Id: Ic63a77ae94192a6e3ce3f94306ed64bc587b4380
wl12xx: fix unbalanced wakelock in IRQ-while-suspended path

Change-Id: I2d9cf541884a7e2435865096796a3947439c0f4d
Merge "wlconf: Fix compilation" into cm-10.2
WLAN - compat_wl12xx: more file cleanups

- Remove unused files from compat
- Update Makefile accordingly

Change-Id: I65acbe7ee8063c082a1877ac7f668287f6ba15cd
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
WLAN - wl12xx: Update to R5.SP5.01 from R5.SP3.06 package

wl12xx: fix mem leak in the channel switch command
wl12xx: fix unset ret value in wl1271_join
wl12xx: fix unsafe dereference of the wlvif
cfg80211: consider security during scan results update
wl12xx:support ap a2dp coex

This is the latest version which is officially supported by TI

original commits from:
https://github.com/TI-OpenLink/wl12xx/commits/ol_R5.SP5.01

latest firmware can be found here:
https://github.com/TI-OpenLink/ti-utils/commits/ol_R5.SP5.01

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I913828ff5ca228dc6f875beb41e9369c44a0408d
WLAN - wl12xx: Update version to ol_R5.SP5.01

Updated to reflect the real version.

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I3e9087b1b455477187c9d0c59737b8667d993728
Merge "WLAN - compat_wl12xx: more file cleanups" into cm-10.2
Merge "WLAN - wl12xx: Update version to ol_R5.SP5.01" into cm-10.2
compat-wireless: turn on TESTMODE and MAC DEBUGFS, turn off BT

CONFIG_NL80211_TESTMODE is required to support utils (calibrator)
CONFIG_MAC80211_DEBUGFS is used to control UAPSD mode.
These switches are also turned on in driver kernel config.
Turn off BT module build switches as BT has a separate compat.

Change-Id: I9bf41b8f3e442fddb8cf17da3c0d3138788097a2
Signed-off-by: Igal Chernobelsky <igalc@ti.com>
ti/wlan: Remove obsolete files

They are used nowhere anymore

Change-Id: Id0ecb16b45d85ad6164ab2bff20130f5f8d26907
wl12xx: Import firmware & ini files from ol_R5.SP5.01

This brings us up-to-date with TI ol_R5.SP5.01 release
and eliminates the need for device specific firmware in device/vendor trees

Current firmware:
SR: X.3.10.0.136 MR: X.5.7.0.46

Original files from:
https://github.com/TI-OpenLink/ti-utils/commits/ol_R5.SP5.01

Change-Id: Ie8917768212c2eb5330127fb7d498c0499d7cc8d
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
Merge "ti/wlan: Remove obsolete files" into cm-11.0
Merge "wl12xx: Import firmware & ini files from ol_R5.SP5.01" into cm-11.0
wpa_supplicant_lib: add check for TI specific wpa_supplicant

Set WPA_SUPPL_DIR to TI specific wpa_supplicant tree

Change-Id: I5e26de83bfdc2e00e7b5c55aa4f4d41f54169ea1
Don't require CONFIG_CRC7 to build wl1251/wl12xx for SDIO

CRC7 functions are only used in the SPI code for these drivers, so it's
unnecessary for the SDIO drivers to depend on CONFIG_CRC7. See, for
example, commit a011130265e9 ("wl12xx: remove unused crc7 references")
in Linus's tree.

Change-Id: Ibd4275f9be36c339725c9c644d80bba8cc3bfe4e