AOSP: Unused p2p_search_in_progress()

This came as part of the following AOSP commit, but the function is
not used anywhere. This should be reverted.

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/p2p/p2p.c b/src/p2p/p2p.c
index 51205b884bfa5a0f49e8b11d653a140af3a680de..6b41a097d4eb99d296f2e41293f4b06d5709b70c 100644 (file)
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -4152,6 +4152,15 @@ p2p_get_peer_found(struct p2p_data *p2p, const u8 *addr, int next)
        return &dev->info;
 }
 
+#ifdef ANDROID_P2P
+int p2p_search_in_progress(struct p2p_data *p2p)
+{
+       if (p2p == NULL)
+               return 0;
+
+       return p2p->state == P2P_SEARCH;
+}
+#endif
 
 int p2p_in_progress(struct p2p_data *p2p)
 {

diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index 9b6921e556375fd528bb1725a01f8d9b98281aa0..93429337f970acb5c9a08da98bb2544f4c90afae 100644 (file)
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -1771,6 +1771,14 @@ int p2p_set_pref_chan(struct p2p_data *p2p, unsigned int num_pref_chan,
  */
 int p2p_in_progress(struct p2p_data *p2p);
 
+#ifdef ANDROID_P2P
+/**
+ * p2p_search_in_progress - Check whether a P2P SEARCH is in progress
+ * @p2p: P2P module context from p2p_init()
+ * Returns: 0 if P2P module is idle or 1 if an operation is in progress
+ */
+int p2p_search_in_progress(struct p2p_data *p2p);
+
 /**
  * p2p_other_scan_completed - Notify completion of non-P2P scan
  * @p2p: P2P module context from p2p_init()