Module Name: src
Committed By: msaitoh
Date: Wed Sep 27 10:31:29 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c
Log Message:
Print device name in ixv_attach().
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/ixgbe/ixv.c
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.100 src/sys/dev/pci/ixgbe/ixgbe.c:1.101
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.100 Thu Aug 31 02:48:55 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Sep 27 10:31:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.100 2017/08/31 02:48:55 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.101 2017/09/27 10:31:29 msaitoh Exp $ */
/******************************************************************************
@@ -823,15 +823,9 @@ ixgbe_attach(device_t parent, device_t d
case ixgbe_mac_82599EB:
str = "82599EB";
break;
- case ixgbe_mac_82599_vf:
- str = "82599 VF";
- break;
case ixgbe_mac_X540:
str = "X540";
break;
- case ixgbe_mac_X540_vf:
- str = "X540 VF";
- break;
case ixgbe_mac_X550:
str = "X550";
break;
@@ -841,15 +835,6 @@ ixgbe_attach(device_t parent, device_t d
case ixgbe_mac_X550EM_a:
str = "X550EM A";
break;
- case ixgbe_mac_X550_vf:
- str = "X550 VF";
- break;
- case ixgbe_mac_X550EM_x_vf:
- str = "X550EM X VF";
- break;
- case ixgbe_mac_X550EM_a_vf:
- str = "X550EM A VF";
- break;
default:
str = "Unknown";
break;
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.65 src/sys/dev/pci/ixgbe/ixv.c:1.66
--- src/sys/dev/pci/ixgbe/ixv.c:1.65 Fri Sep 15 08:31:32 2017
+++ src/sys/dev/pci/ixgbe/ixv.c Wed Sep 27 10:31:29 2017
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.65 2017/09/15 08:31:32 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.66 2017/09/27 10:31:29 msaitoh Exp $*/
/******************************************************************************
@@ -284,6 +284,7 @@ ixv_attach(device_t parent, device_t dev
ixgbe_vendor_info_t *ent;
const struct pci_attach_args *pa = aux;
const char *apivstr;
+ const char *str;
char buf[256];
INIT_DEBUGOUT("ixv_attach: begin");
@@ -348,18 +349,23 @@ ixv_attach(device_t parent, device_t dev
switch (hw->device_id) {
case IXGBE_DEV_ID_82599_VF:
hw->mac.type = ixgbe_mac_82599_vf;
+ str = "82599 VF";
break;
case IXGBE_DEV_ID_X540_VF:
hw->mac.type = ixgbe_mac_X540_vf;
+ str = "X540 VF";
break;
case IXGBE_DEV_ID_X550_VF:
hw->mac.type = ixgbe_mac_X550_vf;
+ str = "X550 VF";
break;
case IXGBE_DEV_ID_X550EM_X_VF:
hw->mac.type = ixgbe_mac_X550EM_x_vf;
+ str = "X550EM X VF";
break;
case IXGBE_DEV_ID_X550EM_A_VF:
hw->mac.type = ixgbe_mac_X550EM_a_vf;
+ str = "X550EM A VF";
break;
default:
/* Shouldn't get here since probe succeeded */
@@ -368,6 +374,7 @@ ixv_attach(device_t parent, device_t dev
goto err_out;
break;
}
+ aprint_normal_dev(dev, "device %s\n", str);
ixv_init_device_features(adapter);
