]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
prism54: prism54_get_encode() test below 0 on unsigned index
authorRoel Kluin <12o3l@tiscali.nl>
Wed, 23 Apr 2008 19:56:49 +0000 (21:56 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 24 Apr 2008 01:25:36 +0000 (21:25 -0400)
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 <linville@tuxdriver.com>
drivers/net/wireless/prism54/isl_ioctl.c

index e5b3c282009ce8c7824efbb102ae398cfce97ecc..5b375b289036fe8d5f9ed2f5dd8fd73325831725 100644 (file)
@@ -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);