AOSP: nl80211 modification for _shared_freq

This came in as a part of this AOSP commit:

commit 1f69aa52ea2e0a73ac502565df8c666ee49cab6a
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Tue Jan 24 16:10:04 2012 -0800

    Update to new version 0.8.16 from BRCM

    Sync with main tree commit b8349523e460493fa0b4de36c689595109e45e91
    Author: Neeraj Kumar Garg <neerajkg@broadcom.com>
    Date:   Tue Dec 27 23:21:45 2011 +0200
        P2P: Reject p2p_group_add if forced frequency is not acceptable

    Change-Id: Icb4541a371b05c270e80440d7a7fdea7f33ff61e
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 366627fc128eeda0ff0334dacdfa846b831f9ccc..a3ff189bffed7d4bc150584435fc5eb986bd5296 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -9818,7 +9818,11 @@ static int wpa_driver_nl80211_shared_freq(void *priv)
                         struct wpa_driver_nl80211_data, list) {
                if (drv == driver ||
                    os_strcmp(drv->phyname, driver->phyname) != 0 ||
+#ifdef ANDROID_P2P
+                   (!driver->associated && !is_ap_interface(driver->nlmode)))
+#else
                    !driver->associated)
+#endif
                        continue;
 
                wpa_printf(MSG_DEBUG, "nl80211: Found a match for PHY %s - %s "