[src/netbsd-8]: src/sys/dev/pci Pull up following revision(s) (requested by j...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/950be86b082f
branches:  netbsd-8
changeset: 452915:950be86b082f
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jul 27 17:11:09 2019 +0000

description:
Pull up following revision(s) (requested by jakllsch in ticket #1308):

        sys/dev/pci/if_wpi.c: revision 1.86

Put back correct recieve ring allocation size which was lost just over
five years ago mae culpa.

Found by msaitoh@

Should fix PR kern/54320 once pulled up.

diffstat:

 sys/dev/pci/if_wpi.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5dd8d44b52c5 -r 950be86b082f sys/dev/pci/if_wpi.c
--- a/sys/dev/pci/if_wpi.c      Fri Jul 26 11:28:46 2019 +0000
+++ b/sys/dev/pci/if_wpi.c      Sat Jul 27 17:11:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wpi.c,v 1.78.2.1 2017/12/10 10:10:24 snj Exp $      */
+/*     $NetBSD: if_wpi.c,v 1.78.2.2 2019/07/27 17:11:09 martin Exp $   */
 
 /*-
  * Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.78.2.1 2017/12/10 10:10:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.78.2.2 2019/07/27 17:11:09 martin Exp $");
 
 /*
  * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -668,7 +668,7 @@
 
        ring->cur = 0;
 
-       size = WPI_RX_RING_COUNT * sizeof (uint32_t);
+       size = WPI_RX_RING_COUNT * sizeof (struct wpi_rx_desc);
        error = wpi_dma_contig_alloc(sc->sc_dmat, &ring->desc_dma,
            (void **)&ring->desc, size,
            WPI_RING_DMA_ALIGN, BUS_DMA_NOWAIT);