diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-03 21:41:58 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-03 21:41:58 +0100 |
commit | 1725d409caba16ea5fc694bd50e95e79e8ced11a (patch) | |
tree | 688fe26dd4ceda5364692f0ce307aadb6f04f331 /Documentation/DocBook | |
parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
parent | mac80211: Cancel the dynamic ps timer in ioctl_siwpower. (diff) | |
download | linux-1725d409caba16ea5fc694bd50e95e79e8ced11a.tar.xz linux-1725d409caba16ea5fc694bd50e95e79e8ced11a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/mac80211.tmpl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/DocBook/mac80211.tmpl b/Documentation/DocBook/mac80211.tmpl index 77c3c202991b..8af6d9626878 100644 --- a/Documentation/DocBook/mac80211.tmpl +++ b/Documentation/DocBook/mac80211.tmpl @@ -17,8 +17,7 @@ </authorgroup> <copyright> - <year>2007</year> - <year>2008</year> + <year>2007-2009</year> <holder>Johannes Berg</holder> </copyright> @@ -165,8 +164,8 @@ usage should require reading the full document. !Pinclude/net/mac80211.h Frame format </sect1> <sect1> - <title>Alignment issues</title> - <para>TBD</para> + <title>Packet alignment</title> +!Pnet/mac80211/rx.c Packet alignment </sect1> <sect1> <title>Calling into mac80211 from interrupts</title> @@ -223,6 +222,11 @@ usage should require reading the full document. !Finclude/net/mac80211.h ieee80211_key_flags </chapter> + <chapter id="powersave"> + <title>Powersave support</title> +!Pinclude/net/mac80211.h Powersave support + </chapter> + <chapter id="qos"> <title>Multiple queues and QoS support</title> <para>TBD</para> |