From owner-freebsd-current@FreeBSD.ORG  Sat Jun 28 07:41:14 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 1848437B401; Sat, 28 Jun 2003 07:41:14 -0700 (PDT)
Received: from elvis.mu.org (elvis.mu.org [192.203.228.196])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 94FFD43FDF; Sat, 28 Jun 2003 07:41:13 -0700 (PDT)
	(envelope-from mux@freebsd.org)
Received: by elvis.mu.org (Postfix, from userid 1920)
	id 7D4322ED43B; Sat, 28 Jun 2003 07:41:13 -0700 (PDT)
Date: Sat, 28 Jun 2003 16:41:13 +0200
From: Maxime Henrion <mux@freebsd.org>
To: "Sergey A. Osokin" <osa@FreeBSD.org>
Message-ID: <20030628144113.GB42121@elvis.mu.org>
References: <200306281535.19370.avleeuwen@piwebs.com>
	<20030628100545.R48518-100000@www.missl.cs.umd.edu>
	<20030628141216.GH64633@freebsd.org.ru>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20030628141216.GH64633@freebsd.org.ru>
User-Agent: Mutt/1.4.1i
cc: freebsd-current@freebsd.org
cc: Arjan van Leeuwen <avleeuwen@piwebs.com>
cc: Justin Ma <jtm@cs.umd.edu>
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:41:14 -0000

Sergey A. Osokin wrote:
> 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
>                              / \

> 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"

Could you commit it please?  I'm pretty sure Sam will be happy to see
that people didn't wait for him to be online to fix such a trivial
compile fix.  If you really don't want to do it, I'll commit it myself.

Maxime