diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-08-18 09:01:23 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-24 16:32:04 -0400 |
commit | 633dd1ea683d907af944bcd9814092efe9869b05 (patch) | |
tree | ac03a42f4c14ac66689df6b069d35cc763687677 | |
parent | 7273b9700b74e8c26b612207aea47effb0e530bf (diff) |
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>
-rw-r--r-- | Documentation/DocBook/80211.tmpl | 1 | ||||
-rw-r--r-- | 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 6f88e184d2e7..52310ac892ea 100644 --- a/Documentation/DocBook/80211.tmpl +++ b/Documentation/DocBook/80211.tmpl | |||
@@ -248,7 +248,6 @@ MISSING | |||
248 | <!-- intentionally multiple !F lines to get proper order --> | 248 | <!-- intentionally multiple !F lines to get proper order --> |
249 | !Finclude/net/mac80211.h set_key_cmd | 249 | !Finclude/net/mac80211.h set_key_cmd |
250 | !Finclude/net/mac80211.h ieee80211_key_conf | 250 | !Finclude/net/mac80211.h ieee80211_key_conf |
251 | !Finclude/net/mac80211.h ieee80211_key_alg | ||
252 | !Finclude/net/mac80211.h ieee80211_key_flags | 251 | !Finclude/net/mac80211.h ieee80211_key_flags |
253 | </chapter> | 252 | </chapter> |
254 | 253 | ||
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 914c747ac3a0..2a1811366076 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); | |||
2537 | /** | 2537 | /** |
2538 | * ieee80211_request_smps - request SM PS transition | 2538 | * ieee80211_request_smps - request SM PS transition |
2539 | * @vif: &struct ieee80211_vif pointer from the add_interface callback. | 2539 | * @vif: &struct ieee80211_vif pointer from the add_interface callback. |
2540 | * @mode: new SM PS mode | 2540 | * @smps_mode: new SM PS mode |
2541 | * | 2541 | * |
2542 | * This allows the driver to request an SM PS transition in managed | 2542 | * This allows the driver to request an SM PS transition in managed |
2543 | * mode. This is useful when the driver has more information than | 2543 | * mode. This is useful when the driver has more information than |