Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci/ixgbe Extra "buf->map = NULL; "s in ixgbe_txeof()...



details:   https://anonhg.NetBSD.org/src/rev/36556fece00b
branches:  trunk
changeset: 819354:36556fece00b
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Nov 30 05:30:28 2016 +0000

description:
Extra "buf->map = NULL;"s in ixgbe_txeof() were removed in FreeBSD r282299.
This was fixed in NetBSD's ixgbe.c rev. 1.28. Remove our comment.

diffstat:

 sys/dev/pci/ixgbe/ix_txrx.c |  11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diffs (35 lines):

diff -r 8210cff26887 -r 36556fece00b sys/dev/pci/ixgbe/ix_txrx.c
--- a/sys/dev/pci/ixgbe/ix_txrx.c       Wed Nov 30 02:08:57 2016 +0000
+++ b/sys/dev/pci/ixgbe/ix_txrx.c       Wed Nov 30 05:30:28 2016 +0000
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 279805 2015-03-09 10:29:15Z araujo $*/
-/*$NetBSD: ix_txrx.c,v 1.1 2016/11/28 02:23:33 msaitoh Exp $*/
+/*$NetBSD: ix_txrx.c,v 1.2 2016/11/30 05:30:28 msaitoh Exp $*/
 
 #include "ixgbe.h"
 
@@ -1017,10 +1017,6 @@
                            buf->map);
                        m_freem(buf->m_head);
                        buf->m_head = NULL;
-                       /*
-                        * NetBSD: Don't override buf->map with NULL here.
-                        * It'll panic when a ring runs one lap around.
-                        */
                }
                buf->eop = NULL;
                ++txr->tx_avail;
@@ -1047,11 +1043,6 @@
                                    buf->map);
                                m_freem(buf->m_head);
                                buf->m_head = NULL;
-                               /*
-                                * NetBSD: Don't override buf->map with NULL
-                                * here. It'll panic when a ring runs one lap
-                                * around.
-                                */
                        }
                        ++txr->tx_avail;
                        buf->eop = NULL;



Home | Main Index | Thread Index | Old Index