Workaround delays caused by vmem_check().

PR:		kern/197143
Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>

diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index ab9f0ffd94c2ccb47904a822706b55045b9d2b0c..c70163eda406ce65d9255a42d7163611f15addc8 100644 (file)
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -2188,10 +2188,12 @@ wpi_notif_intr(struct wpi_softc *sc)
                        break;
                }
                }
-       }
 
-       /* Tell the firmware what we have processed. */
-       wpi_update_rx_ring(sc);
+               if (sc->rxq.cur % 8 == 0) {
+                       /* Tell the firmware what we have processed. */
+                       wpi_update_rx_ring(sc);
+               }
+       }
 }
 
 /*

diff --git a/sys/dev/wpi/if_wpireg.h b/sys/dev/wpi/if_wpireg.h
index 6a7fbee17fc693b80f04c990338fed2950732c3c..7e60049a983a9a83f489f0fff048ab3a4b3ec68f 100644 (file)
--- a/sys/dev/wpi/if_wpireg.h
+++ b/sys/dev/wpi/if_wpireg.h
@@ -20,7 +20,13 @@
 #define WPI_TX_RING_COUNT      256
 #define WPI_TX_RING_LOMARK     192
 #define WPI_TX_RING_HIMARK     224
+
+#ifdef DIAGNOSTIC
+#define WPI_RX_RING_COUNT_LOG  8
+#else
 #define WPI_RX_RING_COUNT_LOG  6
+#endif
+
 #define WPI_RX_RING_COUNT      (1 << WPI_RX_RING_COUNT_LOG)
 
 #define WPI_NTXQUEUES          8