From cf38eb879db438e3df0a111e5cf548f5519cdccd Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Fri, 1 Nov 2013 12:13:58 +0200
Subject: [PATCH] AOSP: P2P GO Neg oper_freq update from GO Neg Confirm

---
 src/p2p/p2p_go_neg.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c
index e2a31e45a..8740ed5ba 100644
--- a/src/p2p/p2p_go_neg.c
+++ b/src/p2p/p2p_go_neg.c
@@ -1104,6 +1104,16 @@ void p2p_process_go_neg_conf(struct p2p_data *p2p, const u8 *sa,
 		}
 	}
 
+#ifdef ANDROID_P2P
+	if (msg.operating_channel) {
+		dev->oper_freq = p2p_channel_to_freq(msg.operating_channel[3],
+						     msg.operating_channel[4]);
+		p2p_dbg(p2p, "P2P: Peer operating channel preference: %d MHz",
+			dev->oper_freq);
+	} else
+		dev->oper_freq = 0;
+#endif
+
 	if (!msg.channel_list) {
 		p2p_dbg(p2p, "Mandatory Operating Channel attribute missing from GO Negotiation Confirmation");
 #ifdef CONFIG_P2P_STRICT
-- 
2.47.2