From 3477d03dfcbf558a883e65b9d7a0f78929ef73f2 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Sun, 25 Nov 2012 19:13:28 +0100
Subject: [PATCH] --- yaml --- r: 341599 b: refs/heads/master c:
 c216e6417f473ab4666f539844652bf2f4129777 h: refs/heads/master i:   341597:
 bdae4fa9cf74981d441c3d6f493a13a3879650be   341595:
 306af8f65b43eba57a06f99cab38e0461a8aea4f   341591:
 28c5069f28c9256db97c259f7c62e007ac5e9897   341583:
 ce9a6a9615fed181ca287a5fc469348531384e4f   341567:
 d496e863b2d7cf0a2e5e20d775a093790301f9a2 v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/cfg80211.h | 5 +++--
 trunk/net/wireless/util.c    | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 43dfc0e0b2f9..618fc7d9d7c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0172bb75073e11a5aa9d8a953bdaefb8709f00c8
+refs/heads/master: c216e6417f473ab4666f539844652bf2f4129777
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
index 8a1aec54e68f..c2c185febb87 100644
--- a/trunk/include/net/cfg80211.h
+++ b/trunk/include/net/cfg80211.h
@@ -3652,8 +3652,9 @@ void cfg80211_unregister_wdev(struct wireless_dev *wdev);
  * the data is malformed or the attribute can't be found (respectively),
  * or the length of the found attribute (which can be zero).
  */
-unsigned int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len,
-				   u8 attr, u8 *buf, unsigned int bufsize);
+int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len,
+			  enum ieee80211_p2p_attr_id attr,
+			  u8 *buf, unsigned int bufsize);
 
 /* Logging, debugging and troubleshooting/diagnostic helpers. */
 
diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c
index b99f01cda1f6..db61fe8a6b6d 100644
--- a/trunk/net/wireless/util.c
+++ b/trunk/net/wireless/util.c
@@ -980,8 +980,9 @@ u32 cfg80211_calculate_bitrate(struct rate_info *rate)
 }
 EXPORT_SYMBOL(cfg80211_calculate_bitrate);
 
-unsigned int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len,
-				   u8 attr, u8 *buf, unsigned int bufsize)
+int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len,
+			  enum ieee80211_p2p_attr_id attr,
+			  u8 *buf, unsigned int bufsize)
 {
 	u8 *out = buf;
 	u16 attr_remaining = 0;