[src/trunk]: src/sys/dev/pci/ixgbe - Add missing pmf_device_deregister() in i...

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

details:   https://anonhg.NetBSD.org/src/rev/a9569a5432a9
branches:  trunk
changeset: 349255:a9569a5432a9
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Dec 02 10:46:58 2016 +0000

description:
- Add missing pmf_device_deregister() in ixgbe_detach()
- Remove extra newline from an sysctl description.
- Fix dmesg output when the number of PCIe lane can't get.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  12 +++++++-----
 sys/dev/pci/ixgbe/ixgbe.h |   4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r 643c249c0bb4 -r a9569a5432a9 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Fri Dec 02 10:42:04 2016 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Fri Dec 02 10:46:58 2016 +0000
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 292674 2015-12-23 22:45:17Z sbruno $*/
-/*$NetBSD: ixgbe.c,v 1.48 2016/12/02 10:42:04 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.49 2016/12/02 10:46:58 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -700,6 +700,8 @@
        }
 #endif /* PCI_IOV */
 
+       pmf_device_deregister(dev);
+
        ether_ifdetach(adapter->ifp);
        /* Stop the adapter */
        IXGBE_CORE_LOCK(adapter);
@@ -3706,13 +3708,13 @@
        mac->ops.set_lan_id(hw);
 
 display:
-       device_printf(dev,"PCI Express Bus: Speed %s %s\n",
+       device_printf(dev,"PCI Express Bus: Speed %s Width %s\n",
            ((hw->bus.speed == ixgbe_bus_speed_8000) ? "8.0GT/s":
            (hw->bus.speed == ixgbe_bus_speed_5000) ? "5.0GT/s":
            (hw->bus.speed == ixgbe_bus_speed_2500) ? "2.5GT/s":"Unknown"),
-           (hw->bus.width == ixgbe_bus_width_pcie_x8) ? "Width x8" :
-           (hw->bus.width == ixgbe_bus_width_pcie_x4) ? "Width x4" :
-           (hw->bus.width == ixgbe_bus_width_pcie_x1) ? "Width x1" :
+           (hw->bus.width == ixgbe_bus_width_pcie_x8) ? "x8" :
+           (hw->bus.width == ixgbe_bus_width_pcie_x4) ? "x4" :
+           (hw->bus.width == ixgbe_bus_width_pcie_x1) ? "x1" :
            ("Unknown"));
 
        if ((hw->device_id != IXGBE_DEV_ID_82599_SFP_SF_QP) &&
diff -r 643c249c0bb4 -r a9569a5432a9 sys/dev/pci/ixgbe/ixgbe.h
--- a/sys/dev/pci/ixgbe/ixgbe.h Fri Dec 02 10:42:04 2016 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.h Fri Dec 02 10:46:58 2016 +0000
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/ixgbe.h 292674 2015-12-23 22:45:17Z sbruno $*/
-/*$NetBSD: ixgbe.h,v 1.16 2016/12/02 10:42:04 msaitoh Exp $*/
+/*$NetBSD: ixgbe.h,v 1.17 2016/12/02 10:46:58 msaitoh Exp $*/
 
 
 #ifndef _IXGBE_H_
@@ -677,7 +677,7 @@
        "\t0x1 - advertise 100M\n" \
        "\t0x2 - advertise 1G\n" \
        "\t0x4 - advertise 10G\n\n" \
-       "\t100M is only supported on certain 10GBaseT adapters.\n"
+       "\t100M is only supported on certain 10GBaseT adapters."
 
 #define IXGBE_SYSCTL_DESC_SET_FC \
        "\nSet flow control mode using these values:\n" \