From owner-svn-src-head@FreeBSD.ORG Wed Jun 10 15:46:41 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8CFB65B; Wed, 10 Jun 2015 15:46:41 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 168EA1AD7; Wed, 10 Jun 2015 15:46:40 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.9/8.14.9) with ESMTP id t5AFkcam042149 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 10 Jun 2015 18:46:38 +0300 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.9/8.14.9/Submit) id t5AFkcjh042148; Wed, 10 Jun 2015 18:46:38 +0300 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Wed, 10 Jun 2015 18:46:38 +0300 From: Gleb Smirnoff To: Adrian Chadd Cc: Andrew Turner , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r283986 - head/sys/net80211 Message-ID: <20150610154638.GK73119@FreeBSD.org> References: <201506041055.t54AtaUD097445@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2015 15:46:41 -0000 Adrian, The patch was quite conservative, just to fix build. I think bigger part of ieee80211_freebsd.h should be hidden under _KERNEL? It could be that the entire file should. On Thu, Jun 04, 2015 at 08:04:38AM -0700, Adrian Chadd wrote: A> oops, sorry! Thanks Andrew! A> A> A> A> -a A> A> A> On 4 June 2015 at 03:55, Andrew Turner wrote: A> > Author: andrew A> > Date: Thu Jun 4 10:55:36 2015 A> > New Revision: 283986 A> > URL: https://svnweb.freebsd.org/changeset/base/283986 A> > A> > Log: A> > Fix the build by hiding ieee80211_add_xmit_params and A> > ieee80211_get_xmit_params from userspace. A> > A> > Modified: A> > head/sys/net80211/ieee80211_freebsd.h A> > A> > Modified: head/sys/net80211/ieee80211_freebsd.h A> > ============================================================================== A> > --- head/sys/net80211/ieee80211_freebsd.h Thu Jun 4 08:05:44 2015 (r283985) A> > +++ head/sys/net80211/ieee80211_freebsd.h Thu Jun 4 10:55:36 2015 (r283986) A> > @@ -610,6 +610,7 @@ struct ieee80211_bpf_params { A> > uint8_t ibp_rate3; /* series 4 IEEE tx rate */ A> > }; A> > A> > +#ifdef _KERNEL A> > struct ieee80211_tx_params { A> > struct ieee80211_bpf_params params; A> > }; A> > @@ -617,6 +618,7 @@ int ieee80211_add_xmit_params(struct mbu A> > const struct ieee80211_bpf_params *); A> > int ieee80211_get_xmit_params(struct mbuf *m, A> > struct ieee80211_bpf_params *); A> > +#endif /* _KERNEL */ A> > A> > /* A> > * Malloc API. Other BSD operating systems have slightly A> > A> -- Totus tuus, Glebius.