mac80211: Fix fatal kernel-doc errors

svn path=/dists/trunk/linux/; revision=22721

debian/changelog

@@ -8,6 +8,7 @@ linux (4.1~rc5-1~exp1) UNRELEASED; urgency=medium
     - linux-image: Fix timestamps in the built-in initramfs
     - linux-source: Fix timestamps in the tarball
     - linux-doc: Drop original timestamp (and name) when compressing
+  * mac80211: Fix fatal kernel-doc errors
 
   [ maximilian attems ]
   * [x86] Enable SND_SOC_INTEL_BROADWELL_MACH. (closes: #785422)

debian/patches/bugfix/all/mac80211-fix-fatal-kernel-doc-errors.patch

@@ -0,0 +1,29 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Wed, 27 May 2015 20:26:54 +0100
+Subject: mac80211: Fix fatal kernel-doc errors
+
+kernel-doc currently fails on include/net/mac80211.h because the
+comments for two struct types claim they are enum types.
+
+Fixes: a9409093d23c ("mac80211: notify the driver about authentication status")
+---
+--- 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

debian/patches/series

@@ -65,6 +65,7 @@ bugfix/all/vfs-read-file_handle-only-once-in-handle_to_path.patch
 debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch
 bugfix/all/make-highlights-deterministic-in-kernel-doc.patch
 bugfix/all/musb-musb-fix-order-of-conditions-for-assigning-end-p.patch
+bugfix/all/mac80211-fix-fatal-kernel-doc-errors.patch
 
 # Miscellaneous features
 features/all/efi-autoload-efi-pstore.patch