From owner-cvs-all@FreeBSD.ORG  Mon Mar 28 11:05:12 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7D8C416A4CE; Mon, 28 Mar 2005 11:05:12 +0000 (GMT)
Received: from mail.chesapeake.net (chesapeake.net [208.142.252.6])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id F214943D1D; Mon, 28 Mar 2005 11:05:11 +0000 (GMT)
	(envelope-from jroberson@chesapeake.net)
Received: from mail.chesapeake.net (localhost [127.0.0.1])
	by mail.chesapeake.net (8.12.10/8.12.10) with ESMTP id j2SB5A9P064132;
	Mon, 28 Mar 2005 06:05:10 -0500 (EST)
	(envelope-from jroberson@chesapeake.net)
Received: from localhost (jroberson@localhost)j2SB5APq064121;
	Mon, 28 Mar 2005 06:05:10 -0500 (EST)
	(envelope-from jroberson@chesapeake.net)
X-Authentication-Warning: mail.chesapeake.net: jroberson owned process doing
	-bs
Date: Mon, 28 Mar 2005 06:05:09 -0500 (EST)
From: Jeff Roberson <jroberson@chesapeake.net>
To: Bill Paul <wpaul@FreeBSD.org>
In-Reply-To: <200503271035.j2RAZ7Gw036894@repoman.freebsd.org>
Message-ID: <20050328060446.X54623@mail.chesapeake.net>
References: <200503271035.j2RAZ7Gw036894@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/compat/ndis kern_ndis.c src/sys/dev/if_ndis
 if_ndis_pci.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Mar 2005 11:05:12 -0000

This wasn't quite right, the following patch fixes the build for me, I
don't know if it's actually correct.

Index: kern_ndis.c
===================================================================
RCS file: /home/ncvs/src/sys/compat/ndis/kern_ndis.c,v
retrieving revision 1.73
diff -u -r1.73 kern_ndis.c
--- kern_ndis.c 27 Mar 2005 10:35:07 -0000      1.73
+++ kern_ndis.c 28 Mar 2005 11:02:47 -0000
@@ -916,7 +916,7 @@
 #if __FreeBSD_version < 600022
        SLIST_INIT(&brl_rev);
 #else
-       STAILQ_INIT(&brl_rev);
+       brl = NULL;
 #endif

        rl = malloc(sizeof(ndis_resource_list) +
@@ -963,7 +963,7 @@

                SLIST_FOREACH(brle, &brl_rev, link) {
 #else
-               STAILQ_FOREACH(brle, &brl, link) {
+               STAILQ_FOREACH(brle, brl, link) {
 #endif
                        switch (brle->type) {
                        case SYS_RES_IOPORT:
@@ -1003,9 +1003,9 @@

        block->nmb_rlist = rl;

+#if __FreeBSD_version < 600022
 bad:

-#if __FreeBSD_version < 600022
        while (!SLIST_EMPTY(&brl_rev)) {
                n = SLIST_FIRST(&brl_rev);
                SLIST_REMOVE_HEAD(&brl_rev, link);


On Sun, 27 Mar 2005, Bill Paul wrote:

> wpaul       2005-03-27 10:35:07 UTC
>
>   FreeBSD src repository
>
>   Modified files:
>     sys/compat/ndis      kern_ndis.c
>     sys/dev/if_ndis      if_ndis_pci.c
>   Log:
>   Argh. PCI resource list became an STAILQ instead of an SLIST. Try to
>   deal with this while maintaining backards source compatibility with
>   stable.
>
>   Revision  Changes    Path
>   1.73      +14 -1     src/sys/compat/ndis/kern_ndis.c
>   1.14      +4 -0      src/sys/dev/if_ndis/if_ndis_pci.c
>