Not approved by RE of course, since stable/9 is open.

Chris


On 2014-09-15 14:44, Christian Brueffer wrote:
Author: brueffer
Date: Mon Sep 15 12:44:44 2014
New Revision: 271621
URL: http://svnweb.freebsd.org/changeset/base/271621

Log:
   MFC: r271286

   Use the right constants in comparisons.  This is currently a nop, as
   MIN_RXD == MIN_TXD and MAX_RXD == MAX_TXD.

   Reviewed by:    Eric Joyner @ Intel
   Approved by:    re (kib)

Modified:
   stable/9/sys/dev/ixgbe/ixgbe.c
   stable/9/sys/dev/ixgbe/ixv.c
Directory Properties:
   stable/9/sys/   (props changed)
   stable/9/sys/dev/   (props changed)
   stable/9/sys/dev/ixgbe/   (props changed)

Modified: stable/9/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- stable/9/sys/dev/ixgbe/ixgbe.c      Mon Sep 15 12:36:40 2014        
(r271620)
+++ stable/9/sys/dev/ixgbe/ixgbe.c      Mon Sep 15 12:44:44 2014        
(r271621)
@@ -517,7 +517,7 @@ ixgbe_attach(device_t dev)
        }

        if (((ixgbe_rxd * sizeof(union ixgbe_adv_rx_desc)) % DBA_ALIGN) != 0 ||
-           ixgbe_rxd < MIN_TXD || ixgbe_rxd > MAX_TXD) {
+           ixgbe_rxd < MIN_RXD || ixgbe_rxd > MAX_RXD) {
                device_printf(dev, "RXD config issue, using default!\n");
                adapter->num_rx_desc = DEFAULT_RXD;
        } else

Modified: stable/9/sys/dev/ixgbe/ixv.c
==============================================================================
--- stable/9/sys/dev/ixgbe/ixv.c        Mon Sep 15 12:36:40 2014        
(r271620)
+++ stable/9/sys/dev/ixgbe/ixv.c        Mon Sep 15 12:44:44 2014        
(r271621)
@@ -347,7 +347,7 @@ ixv_attach(device_t dev)
                adapter->num_tx_desc = ixv_txd;

        if (((ixv_rxd * sizeof(union ixgbe_adv_rx_desc)) % DBA_ALIGN) != 0 ||
-           ixv_rxd < MIN_TXD || ixv_rxd > MAX_TXD) {
+           ixv_rxd < MIN_RXD || ixv_rxd > MAX_RXD) {
                device_printf(dev, "RXD config issue, using default!\n");
                adapter->num_rx_desc = DEFAULT_RXD;
        } else

_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to