From: John W. Linville Date: Wed, 21 Nov 2007 20:24:35 +0000 (-0500) Subject: softmac: mark as obsolete and schedule for removal X-Git-Tag: v2.6.25-rc1~1162^2~1291 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=edae58ead57319b0bcf16e48a32365145c7bf0b7;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: David S. Miller --- 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 --------------------------- + +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 + +--------------------------- 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"