diff options
| author | John W. Linville <linville@tuxdriver.com> | 2007-11-21 15:24:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:55:36 -0800 |
| commit | edae58ead57319b0bcf16e48a32365145c7bf0b7 (patch) | |
| tree | 8afff293b07945ea693e4fe9cc838a7e1530452a | |
| parent | 003faaa17793c478ed2babc56a618396e0ef96c2 (diff) | |
| download | linux-3.10-edae58ead57319b0bcf16e48a32365145c7bf0b7.tar.gz linux-3.10-edae58ead57319b0bcf16e48a32365145c7bf0b7.tar.bz2 linux-3.10-edae58ead57319b0bcf16e48a32365145c7bf0b7.zip | |
softmac: mark as obsolete and schedule for removal
Schedule softmac for for removal in the 2.6.26 development window.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 8 | ||||
| -rw-r--r-- | net/ieee80211/Kconfig | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 8d5f9f8b7a7..ec50a2ee7dd 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -315,3 +315,11 @@ Why: This driver's functionality has been replaced by the Who: John W. Linville <linville@tuxdriver.com> --------------------------- + +What: iee80211 softmac wireless networking component +When: 2.6.26 (or after removal of bcm43xx and port of zd1211rw to mac80211) +Files: net/ieee80211/softmac +Why: No in-kernel drivers will depend on it any longer. +Who: John W. Linville <linville@tuxdriver.com> + +--------------------------- diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig index 1438adedbc8..bd501046c9c 100644 --- a/net/ieee80211/Kconfig +++ b/net/ieee80211/Kconfig @@ -1,8 +1,9 @@ config IEEE80211 - tristate "Generic IEEE 802.11 Networking Stack" + tristate "Generic IEEE 802.11 Networking Stack (DEPRECATED)" ---help--- This option enables the hardware independent IEEE 802.11 - networking stack. + networking stack. This component is deprecated in favor of the + mac80211 component. config IEEE80211_DEBUG bool "Enable full debugging output" |