 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.470 2017/01/27 05:04:47 knakahara Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.471 2017/01/30 09:33:38 knakahara Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -74,27 +74,27 @@
+ *
  *	- Check XXX'ed comments
  *	- Disable D0 LPLU on 8257[12356], 82580 and I350.
  *	- TX Multi queue improvement (refine queue selection logic)
  *	- Split header buffer for newer descriptors
  *	- EEE (Energy Efficiency Ethernet)
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  *	- Image Unique ID
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.470 2017/01/27 05:04:47 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.471 2017/01/30 09:33:38 knakahara Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -7716,27 +7716,27 @@ wm_rxeof(struct wm_rxqueue *rxq)
 	for (i = rxq->rxq_ptr;; i = WM_NEXTRX(i)) {
 		rxs = &rxq->rxq_soft[i];
 		DPRINTF(WM_DEBUG_RX,
 		    ("%s: RX: checking descriptor %d\n",
 		    device_xname(sc->sc_dev), i));
 		wm_cdrxsync(rxq, i,BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
 		status = wm_rxdesc_get_status(rxq, i);
 		errors = wm_rxdesc_get_errors(rxq, i);
 		len = le16toh(wm_rxdesc_get_pktlen(rxq, i));
 		vlantag = wm_rxdesc_get_vlantag(rxq, i);
 #ifdef WM_DEBUG
-		uint32_t rsshash = wm_rxdesc_get_rsshash(rxq, i);
+		uint32_t rsshash = le32toh(wm_rxdesc_get_rsshash(rxq, i));
 		uint8_t rsstype = wm_rxdesc_get_rsstype(rxq, i);
 #endif
 		if (!wm_rxdesc_dd(rxq, i, status))
 			break;
 		count++;
 		if (__predict_false(rxq->rxq_discard)) {
 			DPRINTF(WM_DEBUG_RX,
 			    ("%s: RX: discarding contents of descriptor %d\n",
 			    device_xname(sc->sc_dev), i));
 			wm_init_rxdesc(rxq, i);
 			if (wm_rxdesc_is_eop(rxq, status)) {
 @@ -7828,33 +7828,33 @@ wm_rxeof(struct wm_rxqueue *rxq)
 		DPRINTF(WM_DEBUG_RX,
 		    ("%s: RX: have entire packet, len -> %d\n",
 		    device_xname(sc->sc_dev), len));
 		/* If an error occurred, update stats and drop the packet. */
 		if (wm_rxdesc_has_errors(rxq, errors)) {
 			m_freem(m);
 			continue;
+		}
 		/* No errors.  Receive the packet. */
 		m_set_rcvif(m, ifp);
 		m->m_pkthdr.len = len;
-                /*
+		/*
-                 * TODO
+		 * TODO
-                 * should be save rsshash and rsstype to this mbuf.
+		 * should be save rsshash and rsstype to this mbuf.
-                 */
+		 */
-                DPRINTF(WM_DEBUG_RX,
+		DPRINTF(WM_DEBUG_RX,
-                    ("%s: RX: RSS type=%" PRIu8 ", RSS hash=%" PRIu32 "\n",
+		    ("%s: RX: RSS type=%" PRIu8 ", RSS hash=%" PRIu32 "\n",
-                        device_xname(sc->sc_dev), rsstype, rsshash));
+			device_xname(sc->sc_dev), rsstype, rsshash));
 		/*
 		 * If VLANs are enabled, VLAN packets have been unwrapped
 		 * for us.  Associate the tag with the packet.
 		 */
 		/* XXXX should check for i350 and i354 */
 		if (!wm_rxdesc_input_vlantag(rxq, status, vlantag, m))
 			continue;
 		/* Set up checksum info for this packet. */
 		wm_rxdesc_ensure_checksum(rxq, status, errors, m);
 		mutex_exit(rxq->rxq_lock);