diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-16 22:37:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-16 22:37:51 -0400 |
| commit | 8c95b4773dd8d0415269ffad7301ef96d75be8ee (patch) | |
| tree | 996401ce91c2a652fcff690e2c8bf88f2014d307 /include | |
| parent | bcff122d478b774f4fd5262f35eedebe2f2fb274 (diff) | |
| parent | 30b89b0f5e1313c8a5a039abeaa89248b6338d81 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.26
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/mac80211.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 079e7bd86c90..4a80d74975e8 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -1020,8 +1020,7 @@ enum ieee80211_ampdu_mlme_action { | |||
| 1020 | * level driver (e.g. assoc/disassoc status, erp parameters). | 1020 | * level driver (e.g. assoc/disassoc status, erp parameters). |
| 1021 | * This function should not be used if no BSS has been set, unless | 1021 | * This function should not be used if no BSS has been set, unless |
| 1022 | * for association indication. The @changed parameter indicates which | 1022 | * for association indication. The @changed parameter indicates which |
| 1023 | * of the bss parameters has changed when a call is made. This callback | 1023 | * of the bss parameters has changed when a call is made. |
| 1024 | * has to be atomic. | ||
| 1025 | * | 1024 | * |
| 1026 | * @configure_filter: Configure the device's RX filter. | 1025 | * @configure_filter: Configure the device's RX filter. |
| 1027 | * See the section "Frame filtering" for more information. | 1026 | * See the section "Frame filtering" for more information. |