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

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

details:   https://anonhg.NetBSD.org/src/rev/5cd2140bfbdc
branches:  netbsd-8
changeset: 455137:5cd2140bfbdc
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Oct 08 18:16:50 2019 +0000

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

        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 f5cb883a47f5 -r 5cd2140bfbdc sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Tue Oct 08 18:12:44 2019 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Tue Oct 08 18:16:50 2019 +0000
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.56.2.25 2019/09/26 18:19:26 martin Exp $*/
+/*$NetBSD: ixv.c,v 1.56.2.26 2019/10/08 18:16:50 martin Exp $*/
 
 /******************************************************************************
 
@@ -736,6 +736,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);
 
@@ -768,10 +771,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)) {