From owner-freebsd-wireless@FreeBSD.ORG  Sun Jun 30 16:20:49 2013
Return-Path: <owner-freebsd-wireless@FreeBSD.ORG>
Delivered-To: freebsd-wireless@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 05E35AE5;
 Sun, 30 Jun 2013 16:20:49 +0000 (UTC)
 (envelope-from rpaulo@FreeBSD.org)
Received: from felyko.com (felyko.com [174.136.100.2])
 by mx1.freebsd.org (Postfix) with ESMTP id E8B1C12DF;
 Sun, 30 Jun 2013 16:20:48 +0000 (UTC)
Received: from [IPv6:2601:9:4d00:119:59aa:f7dd:2eeb:e336] (unknown
 [IPv6:2601:9:4d00:119:59aa:f7dd:2eeb:e336])
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (No client certificate requested)
 by felyko.com (Postfix) with ESMTPSA id E6C673982B;
 Sun, 30 Jun 2013 09:20:46 -0700 (PDT)
Subject: Re: CFT: wpa_supplicant/hostapd import patch
Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\))
Content-Type: text/plain; charset=utf-8
From: Rui Paulo <rpaulo@FreeBSD.org>
X-Priority: 3 (Normal)
In-Reply-To: <8819701.20130630194938@serebryakov.spb.ru>
Date: Sun, 30 Jun 2013 09:20:45 -0700
Content-Transfer-Encoding: quoted-printable
Message-Id: <A3A05313-D783-4633-BD60-9E5CA1B7F95B@FreeBSD.org>
References: <7671255B-5582-428A-8ADC-3DF7AA32C772@FreeBSD.org>
 <8819701.20130630194938@serebryakov.spb.ru>
To: Lev Serebryakov <lev@FreeBSD.org>
X-Mailer: Apple Mail (2.1508)
Cc: "freebsd-wireless@freebsd.org" <freebsd-wireless@freebsd.org>
X-BeenThere: freebsd-wireless@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Discussions of 802.11 stack,
 tools device driver development." <freebsd-wireless.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-wireless>, 
 <mailto:freebsd-wireless-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-wireless>
List-Post: <mailto:freebsd-wireless@freebsd.org>
List-Help: <mailto:freebsd-wireless-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-wireless>, 
 <mailto:freebsd-wireless-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Jun 2013 16:20:49 -0000

On 30 Jun 2013, at 08:49, Lev Serebryakov <lev@FreeBSD.org> wrote:

> Hello, Rui.
> You wrote 30 =D0=B8=D1=8E=D0=BD=D1=8F 2013 =D0=B3., 5:04:44:
>=20
> RP> I have a patch that updates the base system version of =
wpa_supplicant / hostapd at:
> RP>         http://people.freebsd.org/~rpaulo/wpa-2.0.diff
> RP> Beware that it's big. It would be really helpful if you could test =
it before I commit it.
>  Patch application error:
>=20
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: contrib/wpa/src/drivers/driver_bsd.c
> |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> |--- contrib/wpa/src/drivers/driver_bsd.c       (working copy)
> |+++ contrib/wpa/src/drivers/driver_bsd.c       (working copy)
> --------------------------
> File to patch:
>=20
> r252418
>=20
> now I have only
>=20
> usr.sbin/wpa/wpa_supplicant/driver_freebsd.c
> usr.sbin/wpa/hostapd/driver_freebsd.c
>=20


Looks like svn wasn't smart enough to include the copy in the diff =
output. Can you copy driver_bsd.c from vendor/wpa/dist/src/drivers?

--
Rui Paulo