Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50dce303 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2015-05-28' of... 

Merge tag 'mac80211-for-davem-2015-05-28' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
This just has a single docbook build fix. In my confusion
I'd already sent the same fix for -next, but Ben Hutchings
noted it's necessary in 4.1.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 71d9f614 3a7af58f

include/net/mac80211.h

+4 −3
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ enum ieee80211_rssi_event_data { 
};



/**

 * enum ieee80211_rssi_event - data attached to an %RSSI_EVENT

 * struct ieee80211_rssi_event - data attached to an %RSSI_EVENT

 * @data: See &enum ieee80211_rssi_event_data

 */

struct ieee80211_rssi_event {
@@ -388,7 +388,7 @@ enum ieee80211_mlme_event_status { 
};



/**

 * enum ieee80211_mlme_event - data attached to an %MLME_EVENT

 * struct ieee80211_mlme_event - data attached to an %MLME_EVENT

 * @data: See &enum ieee80211_mlme_event_data

 * @status: See &enum ieee80211_mlme_event_status

 * @reason: the reason code if applicable
@@ -401,9 +401,10 @@ struct ieee80211_mlme_event { 


/**

 * struct ieee80211_event - event to be sent to the driver

 * @type The event itself. See &enum ieee80211_event_type.

 * @type: The event itself. See &enum ieee80211_event_type.

 * @rssi: relevant if &type is %RSSI_EVENT

 * @mlme: relevant if &type is %AUTH_EVENT

 * @u:    union holding the above two fields

 */

struct ieee80211_event {

	enum ieee80211_event_type type;