mac80211: fix docbook

Fix a small problem in the documentation for
ieee80211_request_smps, and a now erroneous
inclusion of enum ieee80211_key_alg, which no
longer exists after the change to ciphers.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl
index 6f88e184d2e7fadc8cef388fc3029517548e3c42..52310ac892ea03fb719fde9fbfcc2f54864d4462 100644 (file)
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
@@ -248,7 +248,6 @@ MISSING
   <!-- intentionally multiple !F lines to get proper order -->
 !Finclude/net/mac80211.h set_key_cmd
 !Finclude/net/mac80211.h ieee80211_key_conf
-!Finclude/net/mac80211.h ieee80211_key_alg
 !Finclude/net/mac80211.h ieee80211_key_flags
       </chapter>
 

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 914c747ac3a099e68995e3190a55abc6230d7c1c..2a18113660763db65db6d8e7b124999f0282bccf 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -2537,7 +2537,7 @@ void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success);
 /**
  * ieee80211_request_smps - request SM PS transition
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
- * @mode: new SM PS mode
+ * @smps_mode: new SM PS mode
  *
  * This allows the driver to request an SM PS transition in managed
  * mode. This is useful when the driver has more information than