diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-05 15:46:18 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-05 15:46:18 -0500 |
| commit | 3fa04ecd72780da31ba8b329e148179bc24a9c7d (patch) | |
| tree | f5d462fd4aee086952d18f159f737c450ab46b3b /net/mac80211/Kconfig | |
| parent | 180b62a3d837613fcac3ce89576526423926c3c3 (diff) | |
| parent | 1cda707d52e51a6cafac0aef12d2bd7052d572e6 (diff) | |
Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34
Diffstat (limited to 'net/mac80211/Kconfig')
| -rw-r--r-- | net/mac80211/Kconfig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index a10d508b07e1..a952b7f8c648 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig | |||
| @@ -96,18 +96,6 @@ menuconfig MAC80211_DEBUG_MENU | |||
| 96 | ---help--- | 96 | ---help--- |
| 97 | This option collects various mac80211 debug settings. | 97 | This option collects various mac80211 debug settings. |
| 98 | 98 | ||
| 99 | config MAC80211_DEBUG_PACKET_ALIGNMENT | ||
| 100 | bool "Enable packet alignment debugging" | ||
| 101 | depends on MAC80211_DEBUG_MENU | ||
| 102 | ---help--- | ||
| 103 | This option is recommended for driver authors and strongly | ||
| 104 | discouraged for everybody else, it will trigger a warning | ||
| 105 | when a driver hands mac80211 a buffer that is aligned in | ||
| 106 | a way that will cause problems with the IP stack on some | ||
| 107 | architectures. | ||
| 108 | |||
| 109 | Say N unless you're writing a mac80211 based driver. | ||
| 110 | |||
| 111 | config MAC80211_NOINLINE | 99 | config MAC80211_NOINLINE |
| 112 | bool "Do not inline TX/RX handlers" | 100 | bool "Do not inline TX/RX handlers" |
| 113 | depends on MAC80211_DEBUG_MENU | 101 | depends on MAC80211_DEBUG_MENU |