diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-18 21:15:44 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-18 21:15:44 -0700 |
commit | 8e0f36ec371ef4804da46d962d5272b3efb04481 (patch) | |
tree | 7207bb6ffa31c1fe6bf7cddb33561a4ebebd5cc4 /include | |
parent | d28934ad8a4e87203a95de9c376611de8bc2f013 (diff) | |
parent | 3eb75aac8907e7ea36f0d078b2cc7393986001cf (diff) | |
download | op-kernel-dev-8e0f36ec371ef4804da46d962d5272b3efb04481.zip op-kernel-dev-8e0f36ec371ef4804da46d962d5272b3efb04481.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
-rw-r--r-- | include/net/mac80211.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index b397e4d..ff137fd 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -708,10 +708,7 @@ enum ieee80211_tkip_key_type { * rely on the host system for such buffering. This option is used * to configure the IEEE 802.11 upper layer to buffer broadcast and * multicast frames when there are power saving stations so that - * the driver can fetch them with ieee80211_get_buffered_bc(). Note - * that not setting this flag works properly only when the - * %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is also not set because - * otherwise the stack will not know when the DTIM beacon was sent. + * the driver can fetch them with ieee80211_get_buffered_bc(). * * @IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE: * Hardware is not capable of short slot operation on the 2.4 GHz band. @@ -1099,10 +1096,8 @@ enum ieee80211_ampdu_mlme_action { * See the section "Frame filtering" for more information. * This callback must be implemented and atomic. * - * @set_tim: Set TIM bit. If the hardware/firmware takes care of beacon - * generation (that is, %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is set) - * mac80211 calls this function when a TIM bit must be set or cleared - * for a given AID. Must be atomic. + * @set_tim: Set TIM bit. mac80211 calls this function when a TIM bit + * must be set or cleared for a given AID. Must be atomic. * * @set_key: See the section "Hardware crypto acceleration" * This callback can sleep, and is only called between add_interface |