From owner-freebsd-current@FreeBSD.ORG  Sat Jun 28 07:12:21 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5DC8C37B401
	for <freebsd-current@freebsd.org>;
	Sat, 28 Jun 2003 07:12:21 -0700 (PDT)
Received: from freebsd.org.ru (www.freebsd.org.ru [194.84.67.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5D5A943FD7
	for <freebsd-current@freebsd.org>;
	Sat, 28 Jun 2003 07:12:20 -0700 (PDT)
	(envelope-from osa@freebsd.org.ru)
Received: by freebsd.org.ru (Postfix, from userid 1000)
	id 973032C5; Sat, 28 Jun 2003 18:12:16 +0400 (MSD)
Date: Sat, 28 Jun 2003 18:12:16 +0400
From: "Sergey A. Osokin" <osa@FreeBSD.org>
To: Justin Ma <jtm@cs.umd.edu>
Message-ID: <20030628141216.GH64633@freebsd.org.ru>
References: <200306281535.19370.avleeuwen@piwebs.com>
	<20030628100545.R48518-100000@www.missl.cs.umd.edu>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="a1QUDc0q7S3U7/Jg"
Content-Disposition: inline
In-Reply-To: <20030628100545.R48518-100000@www.missl.cs.umd.edu>
User-Agent: Mutt/1.5.4i
cc: freebsd-current@freebsd.org
cc: Arjan van Leeuwen <avleeuwen@piwebs.com>
Subject: Re: HEADS UP: Atheros 802.11 support
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jun 2003 14:12:21 -0000


--a1QUDc0q7S3U7/Jg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Sat, Jun 28, 2003 at 10:09:13AM -0400, Justin Ma wrote:
> This is what I did for a quick fix:
> 
> In sys/dev/ray/if_ray.c, comment out the line:
> 
> 	#include <net/if_ieee80211.h>
> 
> and add the lines
> 
> 	#include <net80211/ieee80211_var.h>
> 	#include <net80211/ieee80211_ioctl.h>
> 
> Just like Sam did with the 'wi' and the 'an' drivers.
> sys/net/if_iee80211.h was removed from the tree, I think.
> 
> On Sat, 28 Jun 2003, Arjan van Leeuwen wrote:
> 
> > Same here.
> >
> > On Saturday 28 June 2003 14:21, Sergey A. Osokin wrote:
> > > Hmm, looks like make depends failed...
> > >
> > > ===> ray
> > > rm -f .depend
> > > mkdep -f .depend -a   -nostdinc -D_KERNEL -DKLD_MODULE -I- -I. -I@ -I@/dev
> > > -I@/. ./include  /usr/src/sys/modules/ray/../../dev/ray/if_ray.c
> > > /usr/src/sys/dev/ray/if_ray.c:265:30: net/if_ieee80211.h: No such file or
> > > directory
> > >
> > > mkdep: compile failed
> > > *** Error code 1
> > >
> > > Stop in /usr/src/sys/modules/ray.
> > > *** Error code 1
> > >
> > > Stop in /usr/src/sys/modules.
> > > *** Error code 1

Yes, you right. Patch attached.

-- 

Rgdz,                        /"\  ASCII RIBBON CAMPAIGN
Sergey Osokin aka oZZ,       \ /    AGAINST HTML MAIL
http://ozz.pp.ru/             X          AND NEWS
                             / \

--a1QUDc0q7S3U7/Jg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-if_ray.c"

Index: src/sys/dev/ray/if_ray.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ray/if_ray.c,v
retrieving revision 1.64
diff -u -r1.64 if_ray.c
--- src/sys/dev/ray/if_ray.c	28 Jun 2003 06:14:57 -0000	1.64
+++ src/sys/dev/ray/if_ray.c	28 Jun 2003 14:07:22 -0000
@@ -262,8 +262,10 @@
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
-#include <net/if_ieee80211.h>
 #include <net/if_llc.h>
+
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_ioctl.h>
 
 #include <dev/pccard/pccardvar.h>
 #include "card_if.h"

--a1QUDc0q7S3U7/Jg--