From owner-svn-src-head@freebsd.org Sun Aug 16 20:44:17 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A801E9BB03E; Sun, 16 Aug 2015 20:44:17 +0000 (UTC) (envelope-from sbruno@ignoranthack.me) Received: from mail.ignoranthack.me (ignoranthack.me [199.102.79.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8CEBC160D; Sun, 16 Aug 2015 20:44:17 +0000 (UTC) (envelope-from sbruno@ignoranthack.me) Received: from [192.168.200.200] (unknown [50.136.155.142]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sbruno@ignoranthack.me) by mail.ignoranthack.me (Postfix) with ESMTPSA id DAA171928D6; Sun, 16 Aug 2015 20:44:15 +0000 (UTC) Reply-To: sbruno@freebsd.org Subject: Re: svn commit: r286832 - head/sys/dev/e1000 References: <201508162010.t7GKAiX3041307@repo.freebsd.org> To: svn-src-head@freebsd.org From: Sean Bruno Message-ID: <55D0F61F.2060503@ignoranthack.me> Date: Sun, 16 Aug 2015 13:44:15 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <201508162010.t7GKAiX3041307@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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: Sun, 16 Aug 2015 20:44:17 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 08/16/15 13:10, Sean Bruno wrote: > Author: sbruno Date: Sun Aug 16 20:10:43 2015 New Revision: 286832 > URL: https://svnweb.freebsd.org/changeset/base/286832 > > Log: e1000/if_lem.c bump to 1.1.0 - deprecate fbsd 8 > > Differential Revision: https://reviews.freebsd.org/D3164 Submitted > by: erj MFC after: 2 weeks Sponsored by: Intel Corporation > > Modified: head/sys/dev/e1000/if_lem.c head/sys/dev/e1000/if_lem.h > > Modified: head/sys/dev/e1000/if_lem.c > ====================================================================== ======== > > - --- head/sys/dev/e1000/if_lem.c Sun Aug 16 19:43:44 2015 (r286831) > +++ head/sys/dev/e1000/if_lem.c Sun Aug 16 20:10:43 2015 (r286832) > @@ -97,7 +97,7 @@ > /********************************************************************* > > * Legacy Em Driver version: > *********************************************************************/ > > - -char lem_driver_version[] = "1.0.6"; > +char lem_driver_version[] = "1.1.0"; > > /********************************************************************* > > * PCI Device ID Table > @@ -2913,10 +2913,6 @@ lem_free_transmit_structures(struct adap > bus_dma_tag_destroy(adapter->txtag); adapter->txtag = NULL; } -#if > __FreeBSD_version >= 800000 - if (adapter->br != NULL) - > buf_ring_free(adapter->br, M_DEVBUF); -#endif } > > /********************************************************************* > > Modified: head/sys/dev/e1000/if_lem.h > ====================================================================== ======== > > - --- head/sys/dev/e1000/if_lem.h Sun Aug 16 19:43:44 2015 (r286831) > +++ head/sys/dev/e1000/if_lem.h Sun Aug 16 20:10:43 2015 (r286832) > @@ -296,9 +296,6 @@ struct em_int_delay_info { /* Our adapter > structure */ struct adapter { if_t ifp; -#if __FreeBSD_version >= > 800000 - struct buf_ring *br; -#endif struct e1000_hw hw; > > /* FreeBSD operating-system-specific structures. */ > > Ugh, sorry for the confusion for some of you. This is removing a freebsd 8 conditional by deleting an unused element in the adapter data structure. This doesn't change the ability to build this driver under FreeBSD 8. sean -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQF8BAEBCgBmBQJV0PYfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCQUFENDYzMkU3MTIxREU4RDIwOTk3REQx MjAxRUZDQTFFNzI3RTY0AAoJEBIB78oecn5kACsH/0A0O9NeGOkwB592rx2uvyUI PTYfR6BPL7ddHHIN1ZMC9Qc1NdlhhleVACtOZd/NVlJxMSo8ITSPgF97UHIy7I7V e4njPkc7z7Z/3QR1CoNXdW/mneZDLaWVOhfdbhhUAXxNE4+z4Qje/LQy/LhA5r43 3DLo6Un6EfC0eerKWzuBL5cQaUHgArqZRTcI0UVyB91YggdJxin1GIbVjYVEnz/j amw0VbgQ59FKmQkJ5cpceO0SFE/sfHfl9qt31z7x3+fSbwdtEg8Mo6H/CaGaX6ZA pwFaEm7hUBYzhvbcSqwNL7KxT6wQEKAjHf4nD+iSwpfvmhtAD5QxjW+0CEzTa6I= =XQvh -----END PGP SIGNATURE-----