From: Dan Williams <dcbw@redhat.com>
To: "Luis R. Rodriguez" <mcgrof@gmail.com>
Cc: Roel Kluin <12o3l@tiscali.nl>,
linux-wireless@vger.kernel.org,
lkml <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] prism54: prism54_get_encode() test below 0 on unsigned index
Date: Mon, 28 Apr 2008 00:10:06 -0400 [thread overview]
Message-ID: <1209355806.20940.15.camel@localhost.localdomain> (raw)
In-Reply-To: <20080426043927.GE4810@ruslug.rutgers.edu>
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
prev parent reply other threads:[~2008-04-28 4:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1209355806.20940.15.camel@localhost.localdomain \
--to=dcbw@redhat.com \
--cc=12o3l@tiscali.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mcgrof@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).