[src/trunk]: src/sys/dev/pci/ixgbe only attach/detach stats->mngptc once.

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

details:   https://anonhg.NetBSD.org/src/rev/e1d71be5ebc9
branches:  trunk
changeset: 328857:e1d71be5ebc9
user:      chs <chs%NetBSD.org@localhost>
date:      Mon Apr 21 16:35:06 2014 +0000

description:
only attach/detach stats->mngptc once.
remove a low-value printf().

diffstat:

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

diffs (57 lines):

diff -r fda0a6559312 -r e1d71be5ebc9 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Mon Apr 21 16:33:48 2014 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Mon Apr 21 16:35:06 2014 +0000
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/
-/*$NetBSD: ixgbe.c,v 1.13 2014/04/17 16:22:48 christos Exp $*/
+/*$NetBSD: ixgbe.c,v 1.14 2014/04/21 16:35:06 chs Exp $*/
 
 #include "opt_inet.h"
 
@@ -805,7 +805,6 @@
        evcnt_detach(&stats->roc);
        evcnt_detach(&stats->rjc);
        evcnt_detach(&stats->mngprc);
-       evcnt_detach(&stats->mngptc);
        evcnt_detach(&stats->xec);
 
        /* Packet Transmission Stats */
@@ -2276,7 +2275,8 @@
                return ENXIO;
        } else {
                aprint_normal_dev(dev, "interrupting at %s\n",
-                   pci_intr_string(adapter->osdep.pc, adapter->osdep.ih, intrbuf, sizeof(intrbuf)));
+                   pci_intr_string(adapter->osdep.pc, adapter->osdep.ih,
+                       intrbuf, sizeof(intrbuf)));
        }
 
        /*
@@ -2550,8 +2550,8 @@
 {
 #if defined(NETBSD_MSI_OR_MSIX)
        struct          ix_queue *que = adapter->queues;
+       device_t        dev = adapter->dev;
 #endif
-       device_t        dev = adapter->dev;
        int             rid;
 
 #if defined(NETBSD_MSI_OR_MSIX)
@@ -2592,7 +2592,6 @@
        else
                (adapter->msix != 0) ? (rid = 1):(rid = 0);
 
-       printf("%s: disestablishing interrupt handler\n", device_xname(dev));
        pci_intr_disestablish(adapter->osdep.pc, adapter->osdep.intr);
        adapter->osdep.intr = NULL;
 
@@ -5634,8 +5633,6 @@
            stats->namebuf, "Received Jabber");
        evcnt_attach_dynamic(&stats->mngprc, EVCNT_TYPE_MISC, NULL,
            stats->namebuf, "Management Packets Received");
-       evcnt_attach_dynamic(&stats->mngptc, EVCNT_TYPE_MISC, NULL,
-           stats->namebuf, "Management Packets Dropped");
        evcnt_attach_dynamic(&stats->xec, EVCNT_TYPE_MISC, NULL,
            stats->namebuf, "Checksum Errors");