summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brown2012-11-21 04:36:07 +0100
committerMichael Brown2012-11-21 04:43:43 +0100
commit717279a294e414218deb1c89d33422b209574053 (patch)
tree2057b15cd611b3660616ce8536d7086c0d032bdf /src
parent[efi] Delegate to child device's EFI_COMPONENT_NAME2_PROTOCOL, if present (diff)
downloadipxe-717279a294e414218deb1c89d33422b209574053.tar.gz
ipxe-717279a294e414218deb1c89d33422b209574053.tar.xz
ipxe-717279a294e414218deb1c89d33422b209574053.zip
[efi] Include product short name in EFI SNP device names
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src')
-rw-r--r--src/interface/efi/efi_snp.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c
index c48572e8..20027596 100644
--- a/src/interface/efi/efi_snp.c
+++ b/src/interface/efi/efi_snp.c
@@ -33,6 +33,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <ipxe/efi/efi_driver.h>
#include <ipxe/efi/efi_strings.h>
#include <ipxe/efi/efi_snp.h>
+#include <config/general.h>
/** EFI simple network protocol GUID */
static EFI_GUID efi_simple_network_protocol_guid
@@ -849,11 +850,12 @@ static int efi_snp_probe ( struct net_device *netdev ) {
/* Populate the component name structure */
efi_snprintf ( snpdev->driver_name,
( sizeof ( snpdev->driver_name ) /
- sizeof ( snpdev->driver_name[0] ) ), "%s",
- netdev->dev->driver_name );
+ sizeof ( snpdev->driver_name[0] ) ),
+ PRODUCT_SHORT_NAME " %s", netdev->dev->driver_name );
efi_snprintf ( snpdev->controller_name,
( sizeof ( snpdev->controller_name ) /
- sizeof ( snpdev->controller_name[0] ) ), "%s (%s)",
+ sizeof ( snpdev->controller_name[0] ) ),
+ PRODUCT_SHORT_NAME " %s (%s)",
netdev->name, netdev_addr ( netdev ) );
snpdev->name2.GetDriverName = efi_snp_get_driver_name;
snpdev->name2.GetControllerName = efi_snp_get_controller_name;