* [PATCH] prism54: prism54_get_encode() test below 0 on unsigned index @ 2008-04-23 19:56 Roel Kluin 2008-04-24 17:09 ` Dan Williams 0 siblings, 1 reply; 5+ messages in thread From: Roel Kluin @ 2008-04-23 19:56 UTC (permalink / raw) To: mcgrof, linux-wireless; +Cc: lkml 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> --- 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); ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] prism54: prism54_get_encode() test below 0 on unsigned index 2008-04-23 19:56 [PATCH] prism54: prism54_get_encode() test below 0 on unsigned index Roel Kluin @ 2008-04-24 17:09 ` Dan Williams 2008-04-25 0:45 ` [PATCH v2] " Roel Kluin 0 siblings, 1 reply; 5+ messages in thread From: Dan Williams @ 2008-04-24 17:09 UTC (permalink / raw) To: Roel Kluin; +Cc: mcgrof, linux-wireless, lkml 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] prism54: prism54_get_encode() test below 0 on unsigned index 2008-04-24 17:09 ` Dan Williams @ 2008-04-25 0:45 ` Roel Kluin 2008-04-26 4:39 ` Luis R. Rodriguez 0 siblings, 1 reply; 5+ messages in thread From: Roel Kluin @ 2008-04-25 0:45 UTC (permalink / raw) To: Dan Williams; +Cc: mcgrof, linux-wireless, lkml Dan Williams wrote: > On Wed, 2008-04-23 at 21:56 +0200, Roel Kluin wrote: >> u32 index = (dwrq->flags & IW_ENCODE_INDEX) - 1; > > Probably should just change that to an 'int' instead of a u32. > > Dan > Thanks, in that case use the patch below --- when left unsigned, the test 'if (index < 0)' will not 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..8076ead 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c @@ -1158,7 +1158,8 @@ prism54_get_encode(struct net_device *ndev, struct iw_request_info *info, { islpci_private *priv = netdev_priv(ndev); struct obj_key *key; - u32 devindex, index = (dwrq->flags & IW_ENCODE_INDEX) - 1; + u32 devindex; + int index = (dwrq->flags & IW_ENCODE_INDEX) - 1; u32 authen = 0, invoke = 0, exunencrypt = 0; int rvalue; union oid_res_t r; ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] prism54: prism54_get_encode() test below 0 on unsigned index 2008-04-25 0:45 ` [PATCH v2] " Roel Kluin @ 2008-04-26 4:39 ` Luis R. Rodriguez 2008-04-28 4:10 ` Dan Williams 0 siblings, 1 reply; 5+ messages in thread From: Luis R. Rodriguez @ 2008-04-26 4:39 UTC (permalink / raw) To: Roel Kluin; +Cc: Dan Williams, linux-wireless, lkml On Fri, Apr 25, 2008 at 02:45:14AM +0200, Roel Kluin wrote: > Dan Williams wrote: > > On Wed, 2008-04-23 at 21:56 +0200, Roel Kluin wrote: > > >> u32 index = (dwrq->flags & IW_ENCODE_INDEX) - 1; > > > > Probably should just change that to an 'int' instead of a u32. > > > > Dan > > > > Thanks, in that case use the patch below > --- > when left unsigned, the test 'if (index < 0)' will not 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..8076ead 100644 > --- a/drivers/net/wireless/prism54/isl_ioctl.c > +++ b/drivers/net/wireless/prism54/isl_ioctl.c > @@ -1158,7 +1158,8 @@ prism54_get_encode(struct net_device *ndev, struct iw_request_info *info, > { > islpci_private *priv = netdev_priv(ndev); > struct obj_key *key; > - u32 devindex, index = (dwrq->flags & IW_ENCODE_INDEX) - 1; > + u32 devindex; > + int index = (dwrq->flags & IW_ENCODE_INDEX) - 1; The check for -1 seems silly lets just remove its use. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index 5b375b2..7e2d3b6 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c @@ -1158,7 +1158,7 @@ prism54_get_encode(struct net_device *ndev, struct iw_request_info *info, { islpci_private *priv = netdev_priv(ndev); struct obj_key *key; - u32 devindex, index = (dwrq->flags & IW_ENCODE_INDEX) - 1; + u32 devindex, index = (dwrq->flags & IW_ENCODE_INDEX); u32 authen = 0, invoke = 0, exunencrypt = 0; int rvalue; union oid_res_t r; @@ -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 == -1 || index > 3) + if (!index || index > 3) /* no index provided, use the current one */ index = devindex; rvalue |= mgt_get_request(priv, DOT11_OID_DEFKEYX, index, NULL, &r); ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] prism54: prism54_get_encode() test below 0 on unsigned index 2008-04-26 4:39 ` Luis R. Rodriguez @ 2008-04-28 4:10 ` Dan Williams 0 siblings, 0 replies; 5+ messages in thread From: Dan Williams @ 2008-04-28 4:10 UTC (permalink / raw) To: Luis R. Rodriguez; +Cc: Roel Kluin, linux-wireless, lkml On Sat, 2008-04-26 at 00:39 -0400, Luis R. Rodriguez wrote: > On Fri, Apr 25, 2008 at 02:45:14AM +0200, Roel Kluin wrote: > > Dan Williams wrote: > > > On Wed, 2008-04-23 at 21:56 +0200, Roel Kluin wrote: > > > > >> u32 index = (dwrq->flags & IW_ENCODE_INDEX) - 1; > > > > > > Probably should just change that to an 'int' instead of a u32. > > > > > > Dan > > > > > > > Thanks, in that case use the patch below > > --- > > when left unsigned, the test 'if (index < 0)' will not 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..8076ead 100644 > > --- a/drivers/net/wireless/prism54/isl_ioctl.c > > +++ b/drivers/net/wireless/prism54/isl_ioctl.c > > @@ -1158,7 +1158,8 @@ prism54_get_encode(struct net_device *ndev, struct iw_request_info *info, > > { > > islpci_private *priv = netdev_priv(ndev); > > struct obj_key *key; > > - u32 devindex, index = (dwrq->flags & IW_ENCODE_INDEX) - 1; > > + u32 devindex; > > + int index = (dwrq->flags & IW_ENCODE_INDEX) - 1; > > The check for -1 seems silly lets just remove its use. > > Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> > > diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c > index 5b375b2..7e2d3b6 100644 > --- a/drivers/net/wireless/prism54/isl_ioctl.c > +++ b/drivers/net/wireless/prism54/isl_ioctl.c > @@ -1158,7 +1158,7 @@ prism54_get_encode(struct net_device *ndev, struct iw_request_info *info, > { > islpci_private *priv = netdev_priv(ndev); > struct obj_key *key; > - u32 devindex, index = (dwrq->flags & IW_ENCODE_INDEX) - 1; > + u32 devindex, index = (dwrq->flags & IW_ENCODE_INDEX); > u32 authen = 0, invoke = 0, exunencrypt = 0; > int rvalue; > union oid_res_t r; > @@ -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 == -1 || index > 3) > + if (!index || index > 3) > /* no index provided, use the current one */ > index = devindex; > rvalue |= mgt_get_request(priv, DOT11_OID_DEFKEYX, index, NULL, &r); This won't allow you to select index 0 then. Hence the reason why the -1 is necessary, so you can distinguish 'no index specified' from 'use index 0'. There's probably a better way to do it, but I don't think this patch will work. Dan ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-04-28 4:13 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-04-23 19:56 [PATCH] prism54: prism54_get_encode() test below 0 on unsigned index Roel Kluin 2008-04-24 17:09 ` Dan Williams 2008-04-25 0:45 ` [PATCH v2] " Roel Kluin 2008-04-26 4:39 ` Luis R. Rodriguez 2008-04-28 4:10 ` Dan Williams
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).