---

yaml --- r: 341599 b: refs/heads/master c: c216e64 h: refs/heads/master i: 341597: bdae4fa 341595: 306af8f 341591: 28c5069 341583: ce9a6a9 341567: d496e86 v: v3
git-mirror · Nov 26, 2012 · 3477d03 · 3477d03
1 parent 5a24dfc
commit 3477d03
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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;