Search Linux Wireless

Re: [PATCH v2]hostap/hostap_ioctl.c Fix variable 'ret' set but not used

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Aug 3, 2010 at 11:03, Luis R. Rodriguez <mcgrof@xxxxxxxxx> wrote:
> On Mon, Aug 2, 2010 at 5:51 PM, Justin P. Mattock
> <justinmattock@xxxxxxxxx> wrote:
>> This a resend after receiving feedback on a better solution.
>>
>> The below patch fixes a warning message generated by GCC:
>>  CC [M]  drivers/net/wireless/hostap/hostap_ioctl.o
>> drivers/net/wireless/hostap/hostap_ioctl.c: In function 'prism2_request_scan':
>> drivers/net/wireless/hostap/hostap_ioctl.c:1666:6: warning: variable 'ret' set but not used
>>
>> Signed-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>
>>
>> ---
>>  drivers/net/wireless/hostap/hostap_ioctl.c |    1 +
>>  1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
>> index a85e43a..955e070 100644
>> --- a/drivers/net/wireless/hostap/hostap_ioctl.c
>> +++ b/drivers/net/wireless/hostap/hostap_ioctl.c
>> @@ -1690,6 +1690,7 @@ static int prism2_request_scan(struct net_device *dev)
>>                                 sizeof(scan_req))) {
>>                printk(KERN_DEBUG "SCANREQUEST failed\n");
>>                ret = -EINVAL;
>> +               return ret;
>>        }
>>
>>        if (!local->host_roaming)
>
> NACK, just make the routine return the ret instead of 0.

As in something along the lines of:

--- hostap_ioctl.c	2010-08-03 11:13:24.000000000 +1000
+++ hostap_ioctl.c~new	2010-08-03 11:14:08.000000000 +1000
@@ -1696,7 +1696,7 @@
 		hostap_set_word(dev, HFA384X_RID_CNFROAMINGMODE,
 				HFA384X_ROAMING_FIRMWARE);

-	return 0;
+	return ret;
 }

 #else /* !PRISM2_NO_STATION_MODES */

(whitespace damange, missing paths, and incorrect names are intentional)

Thanks,

-- 

Julian Calaby

Email: julian.calaby@xxxxxxxxx
.Plan: http://sites.google.com/site/juliancalaby/
--
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


[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]
  Powered by Linux