Module Name: src
Committed By: martin
Date: Sat Jul 27 17:11:09 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wpi.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.78.2.1 -r1.78.2.2 src/sys/dev/pci/if_wpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.78.2.1 src/sys/dev/pci/if_wpi.c:1.78.2.2
--- src/sys/dev/pci/if_wpi.c:1.78.2.1 Sun Dec 10 10:10:24 2017
+++ src/sys/dev/pci/if_wpi.c Sat Jul 27 17:11:09 2019
@@ -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 @@ wpi_alloc_rx_ring(struct wpi_softc *sc,
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);
