diff mbox

P2P: Prevent creation of another interface on group interface for NFC Token enable case

Message ID 79CDAA8ADC9BA24F8E284CAC5BC48608E29251@SJEXCHMB15.corp.ad.broadcom.com
State Accepted
Headers show

Commit Message

Manish Bansal March 14, 2014, 1:38 p.m. UTC
Hi Jouni,

Kindly check the patch is fine.

If group interface is present and command came on
group interface then enable the token for the
current interface.

Signed-off-by: Manish <manish.bansal@broadcom.com>
---
wpa_supplicant/p2p_supplicant.c |   12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)

--
1.7.10.4

Comments

Jan Ceuleers March 14, 2014, 7:20 p.m. UTC | #1
On 03/14/2014 02:38 PM, Manish Bansal wrote:
> Kindly check the patch is fine.

It's whitespace-damaged. Please post the patch as plain text.
Jouni Malinen March 14, 2014, 10:23 p.m. UTC | #2
On Fri, Mar 14, 2014 at 01:38:36PM +0000, Manish Bansal wrote:
> If group interface is present and command came on
> group interface then enable the token for the
> current interface.

Thanks, applied.
diff mbox

Patch

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 09f98a3..25d0b45 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -7545,7 +7545,17 @@  int wpas_p2p_nfc_tag_enabled(struct wpa_supplicant *wpa_s, int enabled)
                             return -1;
              wpa_s->p2p_peer_oob_pk_hash_known = 0;

-              wpa_s->create_p2p_iface = wpas_p2p_create_iface(wpa_s);
+             if(wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_GO ||
+                            wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_CLIENT) {
+
+                            /* P2P Group Interface present and the command came on
+                            * Group Interface. So enable the token for the current
+                            * interface
+                            */
+                            wpa_s->create_p2p_iface = 0;
+             } else {
+                            wpa_s->create_p2p_iface = wpas_p2p_create_iface(wpa_s);
+             }

              if (wpa_s->create_p2p_iface) {
                             enum wpa_driver_if_type iftype;