netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "John W. Linville" <linville@tuxdriver.com>
To: Jean Tourrilhes <jt@hpl.hp.com>
Cc: netdev@vger.kernel.org,
	"James P. Ketrenos" <ipw2100-admin@linux.intel.com>,
	Zhu Yi <yi.zhu@intel.com>
Subject: Re: [PATCH 2.6.18] WE-21 for ipw2200
Date: Tue, 12 Sep 2006 14:02:59 -0400	[thread overview]
Message-ID: <20060912180253.GC7703@tuxdriver.com> (raw)
In-Reply-To: <20060830010140.GF8405@bougret.hpl.hp.com>

On Tue, Aug 29, 2006 at 06:01:40PM -0700, Jean Tourrilhes wrote:
>         Hi,
> 
>         WE-21 for IPW2200 driver...
> 
>         Jean
> 
> Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
> 
> -----------------------------------------------------------
> 
> diff -u -p linux/drivers/net/wireless/ipw2200.20.c linux/drivers/net/wireless/ipw2200.c
> --- linux/drivers/net/wireless/ipw2200.20.c	2006-08-28 17:35:29.000000000 -0700
> +++ linux/drivers/net/wireless/ipw2200.c	2006-08-28 17:36:09.000000000 -0700
> @@ -8861,7 +8861,7 @@ static int ipw_wx_set_essid(struct net_d
>  	int length = 0;
>  	mutex_lock(&priv->mutex);
>  	if (wrqu->essid.flags && wrqu->essid.length) {
> -		length = wrqu->essid.length - 1;
> +		length = wrqu->essid.length;
>  		essid = extra;
>  	}
>  	if (length == 0) {

This hunk doesn't apply to the upstream branch of wireless-2.6.
I propose this one instead:

@@ -8875,8 +8875,6 @@ static int ipw_wx_set_essid(struct net_d
         }
 
 	length = min((int)wrqu->essid.length, IW_ESSID_MAX_SIZE);
-	if (!extra[length - 1])
-		length--;
 
 	priv->config |= CFG_STATIC_ESSID;
 
Everything else stays the same...OK?

John
-- 
John W. Linville
linville@tuxdriver.com

  reply	other threads:[~2006-09-12 18:09 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-30  1:01 [PATCH 2.6.18] WE-21 for ipw2200 Jean Tourrilhes
2006-09-12 18:02 ` John W. Linville [this message]
2006-09-12 18:17   ` Jean Tourrilhes
2006-09-12 21:33   ` Jean Tourrilhes

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=20060912180253.GC7703@tuxdriver.com \
    --to=linville@tuxdriver.com \
    --cc=ipw2100-admin@linux.intel.com \
    --cc=jt@hpl.hp.com \
    --cc=netdev@vger.kernel.org \
    --cc=yi.zhu@intel.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).