Module Name: src
Committed By: msaitoh
Date: Fri Dec 2 10:46:58 UTC 2016
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h
Log Message:
- 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.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/ixgbe/ixgbe.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.48 src/sys/dev/pci/ixgbe/ixgbe.c:1.49
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.48 Fri Dec 2 10:42:04 2016
+++ src/sys/dev/pci/ixgbe/ixgbe.c Fri Dec 2 10:46:58 2016
@@ -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 @@ ixgbe_detach(device_t dev, int flags)
}
#endif /* PCI_IOV */
+ pmf_device_deregister(dev);
+
ether_ifdetach(adapter->ifp);
/* Stop the adapter */
IXGBE_CORE_LOCK(adapter);
@@ -3706,13 +3708,13 @@ ixgbe_get_slot_info(struct adapter *adap
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) &&
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.16 src/sys/dev/pci/ixgbe/ixgbe.h:1.17
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.16 Fri Dec 2 10:42:04 2016
+++ src/sys/dev/pci/ixgbe/ixgbe.h Fri Dec 2 10:46:58 2016
@@ -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 @@ struct adapter {
"\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" \
