diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-22 14:36:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-22 14:36:18 -0700 |
| commit | db138908ccff404b9920f18f6244f4bff2368c04 (patch) | |
| tree | 18734f9b833a5f1134fc138a00d9223fc2afa028 /include/net/mac80211.h | |
| parent | 04024b937a6e9b7d4320b5853557cea3930d528c (diff) | |
| parent | 8bc8aecdc5e26cfda12dbd6867af4aa67836da6a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/net/mac80211.h')
| -rw-r--r-- | include/net/mac80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 8650e7bf2ed..cefe1b37c49 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1160,7 +1160,7 @@ enum ieee80211_hw_flags { * @napi_weight: weight used for NAPI polling. You must specify an * appropriate value here if a napi_poll operation is provided * by your driver. - + * * @max_rx_aggregation_subframes: maximum buffer size (number of * sub-frames) to be used for A-MPDU block ack receiver * aggregation. |