commit c9ac2d56111f67cdeddd12637e9721221cd24a7d
author Jouni Malinen <jouni@qca.qualcomm.com> Mon May 27 15:24:02 2013
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Tue Apr 21 05:29:48 2015
tree 8aec3b4d820616a8a024be34f1626a912a6f5c89
parent cc047282815c77164f2780c5e9d20ff828446885

UPSTREAM: cfg80211: fix VHT TDLS peer AID verification

I (Johannes) accidentally applied the first version of the patch
("Allow TDLS peer AID to be configured for VHT"). Now apply just
the changes between v1 and v2 to get the AID verification and
prefer the new attribute over the old one.

Taken from commit 3d124ea27ae2fc895f81725f0b4c7f3d9c733df4 in kernel
3.11.

BUG=chrome-os-partner:37850
TEST=run with new iwl7000 using this functionality
CQ-DEPEND=CL:266112

Change-Id: I03e89363315a24e45c82393a99a5ca6a547d0843
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Reviewed-on: https://chromium-review.googlesource.com/266113
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Roshan Pius <rpius@chromium.org>
Commit-Queue: Roshan Pius <rpius@chromium.org>