Module Name: src
Committed By: msaitoh
Date: Wed Nov 22 02:36:52 UTC 2017
Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h
Log Message:
Revert if_wmreg.h 1.104 and if_wm.c 1.542. It's not required to mask other
than VLAN ID bits in VLAN tag.
To generate a diff of this commit:
cvs rdiff -u -r1.543 -r1.544 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/pci/if_wmreg.h
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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.543 src/sys/dev/pci/if_wm.c:1.544
--- src/sys/dev/pci/if_wm.c:1.543 Thu Nov 16 03:07:18 2017
+++ src/sys/dev/pci/if_wm.c Wed Nov 22 02:36:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.543 2017/11/16 03:07:18 ozaki-r Exp $ */
+/* $NetBSD: if_wm.c,v 1.544 2017/11/22 02:36:52 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.543 2017/11/16 03:07:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.544 2017/11/22 02:36:52 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -8108,11 +8108,11 @@ wm_rxdesc_get_vlantag(struct wm_rxqueue
struct wm_softc *sc = rxq->rxq_sc;
if (sc->sc_type == WM_T_82574)
- return EXTRXC_VLAN_ID(rxq->rxq_ext_descs[idx].erx_ctx.erxc_vlan);
+ return rxq->rxq_ext_descs[idx].erx_ctx.erxc_vlan;
else if ((sc->sc_flags & WM_F_NEWQUEUE) != 0)
- return NQRXC_VLAN_ID(rxq->rxq_nq_descs[idx].nqrx_ctx.nrxc_vlan);
+ return rxq->rxq_nq_descs[idx].nqrx_ctx.nrxc_vlan;
else
- return WRX_VLAN_ID(rxq->rxq_descs[idx].wrx_special);
+ return rxq->rxq_descs[idx].wrx_special;
}
static inline int
Index: src/sys/dev/pci/if_wmreg.h
diff -u src/sys/dev/pci/if_wmreg.h:1.104 src/sys/dev/pci/if_wmreg.h:1.105
--- src/sys/dev/pci/if_wmreg.h:1.104 Mon Oct 23 23:29:38 2017
+++ src/sys/dev/pci/if_wmreg.h Wed Nov 22 02:36:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmreg.h,v 1.104 2017/10/23 23:29:38 knakahara Exp $ */
+/* $NetBSD: if_wmreg.h,v 1.105 2017/11/22 02:36:52 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -208,12 +208,6 @@ typedef union ext_rxdesc {
#define EXTRXC_STATUS_PKTTYPE_MASK __BITS(19,16)
#define EXTRXC_STATUS_PKTTYPE(status) __SHIFTOUT(status,EXTRXC_STATUS_PKTTYPE_MASK)
-#define EXTRXC_VLAN_ID_MASK __BITS(11,0) /* VLAN identifier mask */
-#define EXTRXC_VLAN_ID(x) ((x) & EXTRXC_VLAN_ID_MASK) /* VLAN identifier */
-#define EXTRXC_VLAN_CFI __BIT(12) /* Canonical Form Indicator */
-#define EXTRXC_VLAN_PRI_MASK __BITS(15,13) /* VLAN priority mask */
-#define EXTRXC_VLAN_PRI(x) __SHIFTOUT((x),EXTRXC_VLAN_PRI_MASK) /* VLAN priority */
-
/* advanced RX descriptor for 82575 and newer */
typedef union nq_rxdesc {
struct {
@@ -336,12 +330,6 @@ typedef union nq_rxdesc {
#define NQRXC_STATUS_MC __BIT(19) /* Packet received from Manageability Controller */
/* "MBC" in i350 spec */
-#define NQRXC_VLAN_ID_MASK __BITS(11,0) /* VLAN identifier mask */
-#define NQRXC_VLAN_ID(x) ((x) & NQRXC_VLAN_ID_MASK) /* VLAN identifier */
-#define NQRXC_VLAN_CFI __BIT(12) /* Canonical Form Indicator */
-#define NQRXC_VLAN_PRI_MASK __BITS(15,13) /* VLAN priority mask */
-#define NQRXC_VLAN_PRI(x) __SHIFTOUT((x),NQRXC_VLAN_PRI_MASK) /* VLAN priority */
-
/*
* The Wiseman transmit descriptor.
*
