diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-31 09:37:46 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-31 09:37:46 +0300 |
| commit | 50dce303d04617d5dbe98e513cb2b586fbf271a7 (patch) | |
| tree | eb1d928c2c1e3cbf45fd920b50036cecb24bd450 /include | |
| parent | 71d9f6149cac8fc6646adfb2a6f3b0de6ddd23f6 (diff) | |
| parent | 3a7af58faa7829faa26026c245d2a8a44e9605c5 (diff) | |
| download | linux-50dce303d04617d5dbe98e513cb2b586fbf271a7.tar.xz | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/mac80211.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 8e3668b44c29..fc57f6b82fc5 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -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; |