[opensuse-kernel] [PATCH V2] b43: Change firmware missing message to refer to openSUSE script
The error message output by b43 contains instructions for obtaining firmware; however, this naturally does not take account of the script /usr/sbin/install_bcm43xx_firmware. Modify the messages to suggest use of the script. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> --- V2 - Fix a typo, and reference a wiki page rather than the forum. This patch could be used for 2.6.31 kernels in openSUSE 11.2 or 2.6.34 kernels in 11.3. Larry --- Index: linux-2.6/drivers/net/wireless/b43/main.c =================================================================== --- linux-2.6.orig/drivers/net/wireless/b43/main.c +++ linux-2.6/drivers/net/wireless/b43/main.c @@ -1976,10 +1976,14 @@ static void b43_release_firmware(struct static void b43_print_fw_helptext(struct b43_wl *wl, bool error) { const char text[] = - "You must go to " \ - "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 you have Internet access with Linux, please open a " \ + "terminal and enter the command " \ + "\"sudo /usr/sbin/install_bcm43xx_firmware\" to download " \ + " the correct firmware for this driver version. " \ + "If you do not have Internet access, go to" \ + "http://en.opensuse.org/HCL/Network_Adapters_(Wireless)/ " \ + "Broadcom_BCM43xx and follow the instructions in the " \ + "\"Installing firmware from RPM packages\" section.\n"; if (error) b43err(wl, text); -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
On Thu, 06 May 2010 13:39:47 -0500, Larry Finger wrote:
V2 - Fix a typo, and reference a wiki page rather than the forum.
Sorry for the long delay. I was in the middle of applying the patch when I noticed two other things: Spaces at the end/beginning of the individual lines in the string are not correct. Not a big deal, easy to fix while applying. However, "If you do not have Internet access, go to this URL" sounds strange. How about this? --- Subject: b43: Change firmware missing message to refer to openSUSE script From: Larry Finger <Larry.Finger@lwfinger.net> Patch-mainline: never The error message output by b43 contains instructions for obtaining firmware; however, this naturally does not take account of the script /usr/sbin/install_bcm43xx_firmware. Modify the messages to suggest use of the script. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Modified-by: Jiri Benc <jbenc@suse.cz> Signed-off-by: Jiri Benc <jbenc@suse.cz> --- drivers/net/wireless/b43/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- linux-2.6.33-master.orig/drivers/net/wireless/b43/main.c +++ linux-2.6.33-master/drivers/net/wireless/b43/main.c @@ -1976,10 +1976,13 @@ static void b43_release_firmware(struct static void b43_print_fw_helptext(struct b43_wl *wl, bool error) { const char text[] = - "You must go to " \ - "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"; + "Please open a terminal and enter the command " \ + "\"sudo /usr/sbin/install_bcm43xx_firmware\" to download " \ + "the correct firmware for this driver version. " \ + "For an off-line installation, go to " \ + "http://en.opensuse.org/HCL/Network_Adapters_(Wireless)/" \ + "Broadcom_BCM43xx and follow the instructions in the " \ + "\"Installing firmware from RPM packages\" section.\n"; if (error) b43err(wl, text); -- Jiri Benc SUSE Labs -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
On 05/17/2010 04:26 AM, Jiri Benc wrote:
On Thu, 06 May 2010 13:39:47 -0500, Larry Finger wrote:
V2 - Fix a typo, and reference a wiki page rather than the forum.
Sorry for the long delay. I was in the middle of applying the patch when I noticed two other things:
Spaces at the end/beginning of the individual lines in the string are not correct. Not a big deal, easy to fix while applying.
However, "If you do not have Internet access, go to this URL" sounds strange.
How about this?
--- Subject: b43: Change firmware missing message to refer to openSUSE script From: Larry Finger <Larry.Finger@lwfinger.net> Patch-mainline: never
The error message output by b43 contains instructions for obtaining firmware; however, this naturally does not take account of the script /usr/sbin/install_bcm43xx_firmware. Modify the messages to suggest use of the script.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Modified-by: Jiri Benc <jbenc@suse.cz> Signed-off-by: Jiri Benc <jbenc@suse.cz>
--- drivers/net/wireless/b43/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
--- linux-2.6.33-master.orig/drivers/net/wireless/b43/main.c +++ linux-2.6.33-master/drivers/net/wireless/b43/main.c @@ -1976,10 +1976,13 @@ static void b43_release_firmware(struct static void b43_print_fw_helptext(struct b43_wl *wl, bool error) { const char text[] = - "You must go to " \ - "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"; + "Please open a terminal and enter the command " \ + "\"sudo /usr/sbin/install_bcm43xx_firmware\" to download " \ + "the correct firmware for this driver version. " \ + "For an off-line installation, go to " \ + "http://en.opensuse.org/HCL/Network_Adapters_(Wireless)/" \ + "Broadcom_BCM43xx and follow the instructions in the " \ + "\"Installing firmware from RPM packages\" section.\n";
if (error) b43err(wl, text);
Jiri, That sounds great. Thanks, Larry -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
Larry Finger píše v Út 18. 05. 2010 v 17:00 -0500:
On 05/17/2010 04:26 AM, Jiri Benc wrote:
On Thu, 06 May 2010 13:39:47 -0500, Larry Finger wrote:
V2 - Fix a typo, and reference a wiki page rather than the forum.
Sorry for the long delay. I was in the middle of applying the patch when I noticed two other things:
Spaces at the end/beginning of the individual lines in the string are not correct. Not a big deal, easy to fix while applying.
However, "If you do not have Internet access, go to this URL" sounds strange.
How about this?
--- Subject: b43: Change firmware missing message to refer to openSUSE script From: Larry Finger <Larry.Finger@lwfinger.net> Patch-mainline: never
The error message output by b43 contains instructions for obtaining firmware; however, this naturally does not take account of the script /usr/sbin/install_bcm43xx_firmware. Modify the messages to suggest use of the script.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Modified-by: Jiri Benc <jbenc@suse.cz> Signed-off-by: Jiri Benc <jbenc@suse.cz>
--- drivers/net/wireless/b43/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
--- linux-2.6.33-master.orig/drivers/net/wireless/b43/main.c +++ linux-2.6.33-master/drivers/net/wireless/b43/main.c @@ -1976,10 +1976,13 @@ static void b43_release_firmware(struct static void b43_print_fw_helptext(struct b43_wl *wl, bool error) { const char text[] = - "You must go to " \ - "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"; + "Please open a terminal and enter the command " \ + "\"sudo /usr/sbin/install_bcm43xx_firmware\" to download " \ + "the correct firmware for this driver version. " \ + "For an off-line installation, go to " \ + "http://en.opensuse.org/HCL/Network_Adapters_(Wireless)/" \ + "Broadcom_BCM43xx and follow the instructions in the " \ + "\"Installing firmware from RPM packages\" section.\n";
if (error) b43err(wl, text);
Jiri,
That sounds great. Thanks,
Hi guys, I must be missing something obvious, but if the machine cannot download the driver with the script (i.e. it has no Internet connectivity), how is the admin supposed to open the web page? Petr Tesarik L3 International -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
On Wed, 19 May 2010 09:32:34 +0200, Petr Tesarik wrote:
On 05/17/2010 04:26 AM, Jiri Benc wrote:
+ "Please open a terminal and enter the command " \ + "\"sudo /usr/sbin/install_bcm43xx_firmware\" to download " \ + "the correct firmware for this driver version. " \ + "For an off-line installation, go to " \ + "http://en.opensuse.org/HCL/Network_Adapters_(Wireless)/" \ + "Broadcom_BCM43xx and follow the instructions in the " \ + "\"Installing firmware from RPM packages\" section.\n";
Hi guys,
I must be missing something obvious, but if the machine cannot download the driver with the script (i.e. it has no Internet connectivity), how is the admin supposed to open the web page?
That was the reason I changed the message that Larry suggested originally. Offline installation != no internet access. If the message is still not clear, please suggest a better wording. Thanks, Jiri -- Jiri Benc SUSE Labs -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
On Wed, 19 May 2010 10:04:07 +0200, Jiri Benc wrote:
That was the reason I changed the message that Larry suggested originally. Offline installation != no internet access. If the message is still not clear, please suggest a better wording.
Committed to the master branch, as nobody came up with a better wording. Jiri -- Jiri Benc SUSE Labs -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
Am Wed, 19 May 2010 09:32:34 +0200 schrieb Petr Tesarik <ptesarik@suse.cz>:
I must be missing something obvious, but if the machine cannot download the driver with the script (i.e. it has no Internet connectivity), how is the admin supposed to open the web page?
Maybe from another computer that has internet access? -- Stefan Seyfried "Any ideas, John?" "Well, surrounding them's out." -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
participants (4)
-
Jiri Benc -
Larry Finger -
Petr Tesarik -
Stefan Seyfried