Since we are not following the schedule to remove OLD_REG by 2.6.29 lets simply set it to default to n for 2.6.30 and schedule its removal for 2.6.31 Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx> --- Documentation/feature-removal-schedule.txt | 5 +++-- net/wireless/Kconfig | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index ac98851..bf83b02 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -7,7 +7,7 @@ be removed from this file. --------------------------- What: old static regulatory information and ieee80211_regdom module parameter -When: 2.6.29 +When: 2.6.31 Why: The old regulatory infrastructure has been replaced with a new one which does not require statically defined regulatory domains. We do not want to keep static regulatory domains in the kernel due to the @@ -19,7 +19,8 @@ Why: The old regulatory infrastructure has been replaced with a new one and used by default the US when CONFIG_WIRELESS_OLD_REGULATORY was set. We also kept around the ieee80211_regdom module parameter in case some applications were relying on it. Changing regulatory domains - can now be done instead by using nl80211, as is done with iw. + can now be done instead by using nl80211, as is done with iw, or + wpa_supplicant. Who: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx> --------------------------- diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index e28e2b8..009f5b8 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -25,7 +25,7 @@ config NL80211 config WIRELESS_OLD_REGULATORY bool "Old wireless static regulatory definitions" - default y + default n ---help--- This option enables the old static regulatory information and uses it within the new framework. This is available -- 1.6.0.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
