From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from charlotte.tuxdriver.com ([70.61.120.58]:57298 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752342Ab0CCUPr (ORCPT ); Wed, 3 Mar 2010 15:15:47 -0500 Date: Wed, 3 Mar 2010 15:14:11 -0500 From: "John W. Linville" To: matthieu castet Cc: linux-wireless@vger.kernel.org, Dan Williams , Jose Alonso Subject: Re: [PATCH] airo : Print of firmware version Message-ID: <20100303201411.GF23920@tuxdriver.com> References: <4B8A80EE.6000102@free.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <4B8A80EE.6000102@free.fr> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Sun, Feb 28, 2010 at 03:42:54PM +0100, matthieu castet wrote: > For the firmware version 5.30.17 the log file shows: > Firmware version 5.30.11 > > The variable softSubVer is binary. > > > Signed-off-by: Matthieu CASTET > Signed-off-by: Jose Alonso > Index: airo.c > =================================================================== > --- 1/drivers/net/wireless/airo.c (r?vision 47) > +++ 2/drivers/net/wireless/airo.c (r?vision 48) > @@ -2993,7 +2993,7 @@ > ai->wep_capable = (cap_rid.softCap & cpu_to_le16(0x02)) ? 1 : 0; > ai->max_wep_idx = (cap_rid.softCap & cpu_to_le16(0x80)) ? 3 : 0; > > - airo_print_info(dev->name, "Firmware version %x.%x.%02x", > + airo_print_info(dev->name, "Firmware version %x.%x.%02d", > ((le16_to_cpu(cap_rid.softVer) >> 8) & 0xF), > (le16_to_cpu(cap_rid.softVer) & 0xFF), > le16_to_cpu(cap_rid.softSubVer)); Why should the last segment be in decimal form if the other two segments of the version number are in hexadecimal form? John -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready.