[src/netbsd-9]: src/sys/dev/pci/ixgbe Pull up following revision(s) (requeste...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d7ac45cf747e
branches:  netbsd-9
changeset: 462626:d7ac45cf747e
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Oct 08 17:05:16 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #293):

        sys/dev/pci/ixgbe/ixv.c: revision 1.139

Set MTU correctly if mtu > 1500.

diffstat:

 sys/dev/pci/ixgbe/ixv.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 7f714b6e6978 -r d7ac45cf747e sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Tue Oct 08 17:02:24 2019 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Tue Oct 08 17:05:16 2019 +0000
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.125.2.4 2019/09/26 19:07:22 martin Exp $*/
+/*$NetBSD: ixv.c,v 1.125.2.5 2019/10/08 17:05:16 martin Exp $*/
 
 /******************************************************************************
 
@@ -716,6 +716,9 @@
        for (i = 0, que = adapter->queues; i < adapter->num_queues; i++, que++)
                que->disabled_count = 0;
 
+       adapter->max_frame_size =
+           ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+
        /* reprogram the RAR[0] in case user changed it. */
        hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0, IXGBE_RAH_AV);
 
@@ -748,10 +751,10 @@
         * Determine the correct mbuf pool
         * for doing jumbo/headersplit
         */
-       if (ifp->if_mtu > ETHERMTU)
+       if (adapter->max_frame_size <= MCLBYTES)
+               adapter->rx_mbuf_sz = MCLBYTES;
+       else
                adapter->rx_mbuf_sz = MJUMPAGESIZE;
-       else
-               adapter->rx_mbuf_sz = MCLBYTES;
 
        /* Prepare receive descriptors and buffers */
        if (ixgbe_setup_receive_structures(adapter)) {