Re: [PATCH] prism54: prism54_get_encode() test below 0 on unsigned index

Dan Williams
2008-04-24T17:13:29Z

On Wed, 2008-04-23 at 21:56 +0200, Roel Kluin wrote:
> previously in this function:
>
> u32 index = (dwrq->flags & IW_ENCODE_INDEX) - 1;

Probably should just change that to an 'int' instead of a u32.

Dan

> index is unsigned, so if -1, the original test (below) didn't work.
>
> Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
> ---
> diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
> index e5b3c28..5b375b2 100644
> --- a/drivers/net/wireless/prism54/isl_ioctl.c
> +++ b/drivers/net/wireless/prism54/isl_ioctl.c
> @@ -1186,7 +1186,7 @@ prism54_get_encode(struct net_device *ndev, struct iw_request_info *info,
> rvalue |= mgt_get_request(priv, DOT11_OID_DEFKEYID, 0, NULL, &r);
> devindex = r.u;
> /* Now get the key, return it */
> - if ((index < 0) || (index > 3))
> + if (index == -1 || index > 3)
> /* no index provided, use the current one */
> index = devindex;
> rvalue |= mgt_get_request(priv, DOT11_OID_DEFKEYX, index, NULL, &r);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html