Schedule softmac for for removal in the 2.6.26 development window. Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> --- Documentation/feature-removal-schedule.txt | 8 ++++++++ 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 c057e36..aeaa129 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -342,3 +342,11 @@ Why: This driver's functionality has been replaced by the Who: John W. Linville <linville@xxxxxxxxxxxxx> --------------------------- + +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@xxxxxxxxxxxxx> + +--------------------------- diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig index 1438ade..bd50104 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" -- 1.5.3.3 - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
