b43: Change schedule for old-fw support removal

The scheduled date for the removal of old fw support was in July 2008.
However, we're not going to remove the support unless it causes a major
headache. So change the schedule from "July 2008" to "when it causes headaches".

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 5ddbe350487acad3a92bc70b057da477901cdc1c..ac98851f7a0cb815043e9ccb355cd40ff9fb89de 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -229,7 +229,9 @@ Who:        Jan Engelhardt <jengelh@computergmbh.de>
 ---------------------------
 
 What:  b43 support for firmware revision < 410
-When:  July 2008
+When:  The schedule was July 2008, but it was decided that we are going to keep the
+        code as long as there are no major maintanance headaches.
+       So it _could_ be removed _any_ time now, if it conflicts with something new.
 Why:   The support code for the old firmware hurts code readability/maintainability
        and slightly hurts runtime performance. Bugfixes for the old firmware
        are not provided by Broadcom anymore.

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index c627bac87a405cdae63d693da307f7b499a0f49a..5ca55dcd0345562401d2b4d266e0f3bdb44b9dd8 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1954,8 +1954,9 @@ static void b43_print_fw_helptext(struct b43_wl *wl, bool error)
        const char *text;
 
        text = "You must go to "
-              "http://linuxwireless.org/en/users/Drivers/b43#devicefirmware "
-              "and download the latest firmware (version 4).\n";
+              "http://wireless.kernel.org/en/users/Drivers/b43#devicefirmware "
+              "and download the correct firmware for this driver version. "
+              "Please carefully read all instructions on this website.\n";
        if (error)
                b43err(wl, text);
        else
@@ -2271,8 +2272,11 @@ static int b43_upload_microcode(struct b43_wldev *dev)
        }
 
        if (b43_is_old_txhdr_format(dev)) {
+               /* We're over the deadline, but we keep support for old fw
+                * until it turns out to be in major conflict with something new. */
                b43warn(dev->wl, "You are using an old firmware image. "
-                       "Support for old firmware will be removed in July 2008.\n");
+                       "Support for old firmware will be removed soon "
+                       "(official deadline was July 2008).\n");
                b43_print_fw_helptext(dev->wl, 0);
        }