Commit-ID: 633dd1ea683d907af944bcd9814092efe9869b05
Gitweb: http://git.kernel.org/tip/633dd1ea683d907af944bcd9814092efe9869b05
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
AuthorDate: Wed, 18 Aug 2010 15:01:23 +0200
Committer: John W. Linville <linville@xxxxxxxxxxxxx>
CommitDate: Tue, 24 Aug 2010 16:32:04 -0400
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@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
---
Documentation/DocBook/80211.tmpl | 1 -
include/net/mac80211.h | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl
index 6f88e18..52310ac 100644
--- 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 914c747..2a18113 100644
--- 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
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|