Module Name: src
Committed By: msaitoh
Date: Wed Dec 6 04:08:50 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h ixgbe_82598.c ixgbe_82598.h
ixgbe_82599.c ixgbe_82599.h ixgbe_api.c ixgbe_api.h ixgbe_common.c
ixgbe_common.h ixgbe_dcb.c ixgbe_dcb.h ixgbe_dcb_82598.c
ixgbe_dcb_82598.h ixgbe_dcb_82599.c ixgbe_dcb_82599.h ixgbe_mbx.c
ixgbe_mbx.h ixgbe_osdep.h ixgbe_phy.c ixgbe_phy.h ixgbe_rss.h
ixgbe_type.h ixgbe_vf.c ixgbe_vf.h ixgbe_x540.c ixgbe_x540.h ixv.c
Log Message:
Sync with FreeBSD's r326022. All of the following changes have no influence
to netbsd:
- Check ETHERCAP_VLAN_HWTAGGING in ixgbe_setup_vlan_hw_support(). This change
has no influence to netbsd because it's enabled by default and NetBSD has
no API to disable it.
- Fix for netmap module.
- Remove never defined UDP_IPV4_EX
- Add SPDX-License-Identifier
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/ixgbe/ixgbe_82598.c \
src/sys/dev/pci/ixgbe/ixgbe_phy.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/ixgbe/ixgbe_82598.h \
src/sys/dev/pci/ixgbe/ixgbe_x540.h
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/ixgbe/ixgbe_82599.c \
src/sys/dev/pci/ixgbe/ixgbe_common.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/ixgbe/ixgbe_82599.h \
src/sys/dev/pci/ixgbe/ixgbe_dcb.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/ixgbe/ixgbe_api.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/ixgbe/ixgbe_api.h \
src/sys/dev/pci/ixgbe/ixgbe_vf.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/ixgbe/ixgbe_common.h \
src/sys/dev/pci/ixgbe/ixgbe_mbx.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/ixgbe/ixgbe_dcb.h \
src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.c \
src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.h \
src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.c \
src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/ixgbe/ixgbe_mbx.h \
src/sys/dev/pci/ixgbe/ixgbe_x540.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/ixgbe/ixgbe_osdep.h
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/ixgbe/ixgbe_phy.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/ixgbe/ixgbe_rss.h
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.114 src/sys/dev/pci/ixgbe/ixgbe.c:1.115
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.114 Fri Nov 24 08:36:22 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Dec 6 04:08:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.114 2017/11/24 08:36:22 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.115 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
@@ -272,6 +272,9 @@ DRIVER_MODULE(ix, pci, ix_driver, ix_dev
MODULE_DEPEND(ix, pci, 1, 1, 1);
MODULE_DEPEND(ix, ether, 1, 1, 1);
+#ifdef DEV_NETMAP
+MODULE_DEPEND(ix, netmap, 1, 1, 1);
+#endif
#endif
/*
@@ -498,9 +501,6 @@ ixgbe_initialize_rss_mapping(struct adap
mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP;
if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4)
mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4_UDP;
- if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4_EX)
- device_printf(adapter->dev, "%s: RSS_HASHTYPE_RSS_UDP_IPV4_EX defined, but not supported\n",
- __func__);
if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6)
mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_UDP;
if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX)
@@ -2185,15 +2185,17 @@ ixgbe_setup_vlan_hw_support(struct adapt
return;
/* Setup the queues for vlans */
- for (i = 0; i < adapter->num_queues; i++) {
- rxr = &adapter->rx_rings[i];
- /* On 82599 the VLAN enable is per/queue in RXDCTL */
- if (hw->mac.type != ixgbe_mac_82598EB) {
- ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxr->me));
- ctrl |= IXGBE_RXDCTL_VME;
- IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(rxr->me), ctrl);
+ if (ec->ec_capenable & ETHERCAP_VLAN_HWTAGGING) {
+ for (i = 0; i < adapter->num_queues; i++) {
+ rxr = &adapter->rx_rings[i];
+ /* On 82599 the VLAN enable is per/queue in RXDCTL */
+ if (hw->mac.type != ixgbe_mac_82598EB) {
+ ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxr->me));
+ ctrl |= IXGBE_RXDCTL_VME;
+ IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(rxr->me), ctrl);
+ }
+ rxr->vtag_strip = TRUE;
}
- rxr->vtag_strip = TRUE;
}
if ((ec->ec_capenable & ETHERCAP_VLAN_HWFILTER) == 0)
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.28 src/sys/dev/pci/ixgbe/ixgbe.h:1.29
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.28 Wed Nov 22 15:15:09 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.h Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe.h,v 1.28 2017/11/22 15:15:09 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.29 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_82598.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_82598.c:1.9 src/sys/dev/pci/ixgbe/ixgbe_82598.c:1.10
--- src/sys/dev/pci/ixgbe/ixgbe_82598.c:1.9 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_82598.c Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_82598.c,v 1.9 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_82598.c,v 1.10 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_phy.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_phy.h:1.9 src/sys/dev/pci/ixgbe/ixgbe_phy.h:1.10
--- src/sys/dev/pci/ixgbe/ixgbe_phy.h:1.9 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_phy.h Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_phy.h,v 1.9 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_phy.h,v 1.10 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_82598.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_82598.h:1.6 src/sys/dev/pci/ixgbe/ixgbe_82598.h:1.7
--- src/sys/dev/pci/ixgbe/ixgbe_82598.h:1.6 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_82598.h Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_82598.h,v 1.6 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_82598.h,v 1.7 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_x540.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_x540.h:1.6 src/sys/dev/pci/ixgbe/ixgbe_x540.h:1.7
--- src/sys/dev/pci/ixgbe/ixgbe_x540.h:1.6 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_x540.h Wed Dec 6 04:08:50 2017
@@ -1,4 +1,5 @@
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_82599.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.15 src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.16
--- src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.15 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_82599.c Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_82599.c,v 1.15 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_82599.c,v 1.16 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_common.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_common.c:1.15 src/sys/dev/pci/ixgbe/ixgbe_common.c:1.16
--- src/sys/dev/pci/ixgbe/ixgbe_common.c:1.15 Fri Oct 13 08:17:44 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_common.c Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_common.c,v 1.15 2017/10/13 08:17:44 msaitoh Exp $ */
+/* $NetBSD: ixgbe_common.c,v 1.16 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_82599.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_82599.h:1.5 src/sys/dev/pci/ixgbe/ixgbe_82599.h:1.6
--- src/sys/dev/pci/ixgbe/ixgbe_82599.h:1.5 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_82599.h Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_82599.h,v 1.5 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_82599.h,v 1.6 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_dcb.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_dcb.c:1.5 src/sys/dev/pci/ixgbe/ixgbe_dcb.c:1.6
--- src/sys/dev/pci/ixgbe/ixgbe_dcb.c:1.5 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_dcb.c Wed Dec 6 04:08:50 2017
@@ -1,4 +1,5 @@
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_api.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_api.c:1.17 src/sys/dev/pci/ixgbe/ixgbe_api.c:1.18
--- src/sys/dev/pci/ixgbe/ixgbe_api.c:1.17 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_api.c Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_api.c,v 1.17 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_api.c,v 1.18 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_api.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_api.h:1.10 src/sys/dev/pci/ixgbe/ixgbe_api.h:1.11
--- src/sys/dev/pci/ixgbe/ixgbe_api.h:1.10 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_api.h Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_api.h,v 1.10 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_api.h,v 1.11 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_vf.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_vf.h:1.10 src/sys/dev/pci/ixgbe/ixgbe_vf.h:1.11
--- src/sys/dev/pci/ixgbe/ixgbe_vf.h:1.10 Thu Sep 14 09:25:58 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_vf.h Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_vf.h,v 1.10 2017/09/14 09:25:58 msaitoh Exp $ */
+/* $NetBSD: ixgbe_vf.h,v 1.11 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_common.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_common.h:1.8 src/sys/dev/pci/ixgbe/ixgbe_common.h:1.9
--- src/sys/dev/pci/ixgbe/ixgbe_common.h:1.8 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_common.h Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_common.h,v 1.8 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_common.h,v 1.9 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_mbx.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_mbx.c:1.8 src/sys/dev/pci/ixgbe/ixgbe_mbx.c:1.9
--- src/sys/dev/pci/ixgbe/ixgbe_mbx.c:1.8 Tue Oct 3 02:55:37 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_mbx.c Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_mbx.c,v 1.8 2017/10/03 02:55:37 msaitoh Exp $ */
+/* $NetBSD: ixgbe_mbx.c,v 1.9 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_dcb.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_dcb.h:1.4 src/sys/dev/pci/ixgbe/ixgbe_dcb.h:1.5
--- src/sys/dev/pci/ixgbe/ixgbe_dcb.h:1.4 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_dcb.h Wed Dec 6 04:08:50 2017
@@ -1,4 +1,5 @@
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.c:1.4 src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.c:1.5
--- src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.c:1.4 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.c Wed Dec 6 04:08:50 2017
@@ -1,4 +1,5 @@
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.h:1.4 src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.h:1.5
--- src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.h:1.4 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.h Wed Dec 6 04:08:50 2017
@@ -1,4 +1,5 @@
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.c:1.4 src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.c:1.5
--- src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.c:1.4 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.c Wed Dec 6 04:08:50 2017
@@ -1,4 +1,5 @@
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h:1.4 src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h:1.5
--- src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h:1.4 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h Wed Dec 6 04:08:50 2017
@@ -1,4 +1,5 @@
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_mbx.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_mbx.h:1.11 src/sys/dev/pci/ixgbe/ixgbe_mbx.h:1.12
--- src/sys/dev/pci/ixgbe/ixgbe_mbx.h:1.11 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_mbx.h Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_mbx.h,v 1.11 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_mbx.h,v 1.12 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_x540.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.11 src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.12
--- src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.11 Wed Oct 4 08:47:26 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_x540.c Wed Dec 6 04:08:50 2017
@@ -1,4 +1,5 @@
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_osdep.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.18 src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.19
--- src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.18 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_osdep.h Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_osdep.h,v 1.18 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_osdep.h,v 1.19 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_phy.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.13 src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.14
--- src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.13 Tue Nov 7 05:41:54 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_phy.c Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_phy.c,v 1.13 2017/11/07 05:41:54 msaitoh Exp $ */
+/* $NetBSD: ixgbe_phy.c,v 1.14 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_rss.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_rss.h:1.1 src/sys/dev/pci/ixgbe/ixgbe_rss.h:1.2
--- src/sys/dev/pci/ixgbe/ixgbe_rss.h:1.1 Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_rss.h Wed Dec 6 04:08:50 2017
@@ -49,7 +49,6 @@
#define RSS_HASHTYPE_RSS_IPV6_EX (1 << 5)
#define RSS_HASHTYPE_RSS_TCP_IPV6_EX (1 << 6)
#define RSS_HASHTYPE_RSS_UDP_IPV4 (1 << 7)
-#define RSS_HASHTYPE_RSS_UDP_IPV4_EX (1 << 8)
#define RSS_HASHTYPE_RSS_UDP_IPV6 (1 << 9)
#define RSS_HASHTYPE_RSS_UDP_IPV6_EX (1 << 10)
Index: src/sys/dev/pci/ixgbe/ixgbe_type.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.29 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.30
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.29 Wed Oct 4 08:47:26 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_type.h,v 1.29 2017/10/04 08:47:26 msaitoh Exp $ */
+/* $NetBSD: ixgbe_type.h,v 1.30 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixgbe_vf.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_vf.c:1.14 src/sys/dev/pci/ixgbe/ixgbe_vf.c:1.15
--- src/sys/dev/pci/ixgbe/ixgbe_vf.c:1.14 Fri Oct 13 08:17:44 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_vf.c Wed Dec 6 04:08:50 2017
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_vf.c,v 1.14 2017/10/13 08:17:44 msaitoh Exp $ */
+/* $NetBSD: ixgbe_vf.c,v 1.15 2017/12/06 04:08:50 msaitoh Exp $ */
/******************************************************************************
+ SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.74 src/sys/dev/pci/ixgbe/ixv.c:1.75
--- src/sys/dev/pci/ixgbe/ixv.c:1.74 Thu Nov 16 03:07:18 2017
+++ src/sys/dev/pci/ixgbe/ixv.c Wed Dec 6 04:08:50 2017
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.74 2017/11/16 03:07:18 ozaki-r Exp $*/
+/*$NetBSD: ixv.c,v 1.75 2017/12/06 04:08:50 msaitoh Exp $*/
/******************************************************************************
@@ -1592,9 +1592,6 @@ ixv_initialize_rss_mapping(struct adapte
__func__);
if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4)
mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4_UDP;
- if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4_EX)
- device_printf(adapter->dev, "%s: RSS_HASHTYPE_RSS_UDP_IPV4_EX defined, but not supported\n",
- __func__);
if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6)
mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_UDP;
if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX)
