From owner-svn-src-stable@freebsd.org Tue Dec 22 18:39:08 2015 Return-Path: Delivered-To: svn-src-stable@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 DFA7AA4F621; Tue, 22 Dec 2015 18:39:08 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 B05121898; Tue, 22 Dec 2015 18:39:08 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBMId7Na009813; Tue, 22 Dec 2015 18:39:07 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBMId7fF009811; Tue, 22 Dec 2015 18:39:07 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201512221839.tBMId7fF009811@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 22 Dec 2015 18:39:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r292614 - stable/10/sys/dev/if_ndis X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2015 18:39:09 -0000 Author: glebius Date: Tue Dec 22 18:39:07 2015 New Revision: 292614 URL: https://svnweb.freebsd.org/changeset/base/292614 Log: Merge r292411: Fix regression in if_ndis in r280347. Modified: stable/10/sys/dev/if_ndis/if_ndis_pci.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/if_ndis/if_ndis_pci.c ============================================================================== --- stable/10/sys/dev/if_ndis/if_ndis_pci.c Tue Dec 22 18:12:11 2015 (r292613) +++ stable/10/sys/dev/if_ndis/if_ndis_pci.c Tue Dec 22 18:39:07 2015 (r292614) @@ -295,8 +295,7 @@ ndis_attach_pci(dev) BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ - BUS_SPACE_MAXSIZE_32BIT, /* maxsize */ - NDIS_NSEG_NEW, /* nsegments */ + DFLTPHYS, NDIS_NSEG_NEW,/* maxsize, nsegments */ BUS_SPACE_MAXSIZE_32BIT,/* maxsegsize */ BUS_DMA_ALLOCNOW, /* flags */ NULL, NULL, /* lockfunc, lockarg */