[efi] Provide a meaningful EFI SNP device name

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/include/ipxe/efi/efi_snp.h b/src/include/ipxe/efi/efi_snp.h
index e1b866eb8dbe861da2fbdcb178a54bcf0af0aa25..a468165c5455e27fe2ade63cb551d2d923c1aacf 100644 (file)
--- 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 e9dd21326802b8636c28015dfe60d46c9d911036..9e7b8dcd4cafc3415cb4c4cc661a9e5088947f32 100644 (file)
--- 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;