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>

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index c627bac87a40..5ca55dcd0345 100644
--- 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);
         }