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 <[EMAIL PROTECTED]>
> 
> -----------------------------------------------------------
> 
> 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
[EMAIL PROTECTED]
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to