aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/cfg80211.h5
-rw-r--r--net/wireless/util.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 8a1aec54e68f..c2c185febb87 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -3652,8 +3652,9 @@ void cfg80211_unregister_wdev(struct wireless_dev *wdev);
3652 * the data is malformed or the attribute can't be found (respectively), 3652 * the data is malformed or the attribute can't be found (respectively),
3653 * or the length of the found attribute (which can be zero). 3653 * or the length of the found attribute (which can be zero).
3654 */ 3654 */
3655unsigned int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len, 3655int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len,
3656 u8 attr, u8 *buf, unsigned int bufsize); 3656 enum ieee80211_p2p_attr_id attr,
3657 u8 *buf, unsigned int bufsize);
3657 3658
3658/* Logging, debugging and troubleshooting/diagnostic helpers. */ 3659/* Logging, debugging and troubleshooting/diagnostic helpers. */
3659 3660
diff --git a/net/wireless/util.c b/net/wireless/util.c
index b99f01cda1f6..db61fe8a6b6d 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -980,8 +980,9 @@ u32 cfg80211_calculate_bitrate(struct rate_info *rate)
980} 980}
981EXPORT_SYMBOL(cfg80211_calculate_bitrate); 981EXPORT_SYMBOL(cfg80211_calculate_bitrate);
982 982
983unsigned int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len, 983int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len,
984 u8 attr, u8 *buf, unsigned int bufsize) 984 enum ieee80211_p2p_attr_id attr,
985 u8 *buf, unsigned int bufsize)
985{ 986{
986 u8 *out = buf; 987 u8 *out = buf;
987 u16 attr_remaining = 0; 988 u16 attr_remaining = 0;