From: Roel Kluin <12o3l@tiscali.nl> Date: Wed, 23 Apr 2008 19:56:49 +0000 (+0200) Subject: prism54: prism54_get_encode() test below 0 on unsigned index X-Git-Tag: v2.6.26-rc1~1088^2~4^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8ba82e969f71d088f718f93d64985d5fcdd9c171;p=linux-2.6-omap-h63xx.git prism54: prism54_get_encode() test below 0 on unsigned index previously in this function: u32 index = (dwrq->flags & IW_ENCODE_INDEX) - 1; index is unsigned, so if -1, the original test (below) didn't work. Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index e5b3c282009..5b375b28903 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);