aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2014-06-25 14:45:08 +0100
committerMichael Brown <mcb30@ipxe.org>2014-06-25 14:46:41 +0100
commitf2c116ff7d8fb9e52c9344c285012f41ee6636f1 (patch)
tree37fa3bf157ffc5fcd74ea23c0ea99058a1b9cc9b
parent44338bfd223c0594420385c21eb25c77d45b405f (diff)
downloadipxe-f2c116ff7d8fb9e52c9344c285012f41ee6636f1.zip
ipxe-f2c116ff7d8fb9e52c9344c285012f41ee6636f1.tar.gz
ipxe-f2c116ff7d8fb9e52c9344c285012f41ee6636f1.tar.bz2
[efi] Provide a meaningful EFI SNP device name
Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/include/ipxe/efi/efi_snp.h2
-rw-r--r--src/interface/efi/efi_snp.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/include/ipxe/efi/efi_snp.h b/src/include/ipxe/efi/efi_snp.h
index e1b866e..a468165 100644
--- a/src/include/ipxe/efi/efi_snp.h
+++ b/src/include/ipxe/efi/efi_snp.h
@@ -65,7 +65,7 @@ struct efi_snp_device {
/** Driver name */
wchar_t driver_name[16];
/** Controller name */
- wchar_t controller_name[32];
+ wchar_t controller_name[64];
/** The device path
*
* This field is variable in size and must appear at the end
diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c
index e9dd213..9e7b8dc 100644
--- a/src/interface/efi/efi_snp.c
+++ b/src/interface/efi/efi_snp.c
@@ -992,7 +992,8 @@ static int efi_snp_probe ( struct net_device *netdev ) {
efi_snprintf ( snpdev->controller_name,
( sizeof ( snpdev->controller_name ) /
sizeof ( snpdev->controller_name[0] ) ),
- "%s %s (%s)", product_short_name, netdev->name,
+ "%s %s (%s, %s)", product_short_name,
+ netdev->dev->driver_name, netdev->dev->name,
netdev_addr ( netdev ) );
snpdev->name2.GetDriverName = efi_snp_get_driver_name;
snpdev->name2.GetControllerName = efi_snp_get_controller_name;