narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[efi] Expose both GUIDs for the EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL 

At some point, it seems that someone decided to change the GUID for
the EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL.  Current EFI builds
ignore the older GUID, older EFI builds ignore the newer GUID, so we
have to expose both.
pull/1/head
Michael Brown 2009-01-12 20:53:38 +00:00
parent aa86afe890
commit 08f6d22410
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/interface/efi/efi_snp.c
View File

@ -91,13 +91,15 @@ static EFI_GUID efi_component_name2_protocol_guid
static EFI_GUID efi_device_path_protocol_guid static EFI_GUID efi_device_path_protocol_guid
= EFI_DEVICE_PATH_PROTOCOL_GUID; = EFI_DEVICE_PATH_PROTOCOL_GUID;
/** Efi network interface identifier GUID */ /** EFI network interface identifier GUID */
static EFI_GUID efi_nii_protocol_guid = { static EFI_GUID efi_nii_protocol_guid
/* No, this isn't the GUID defined as = EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_GUID;
* EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_GUID in
* Protocol/NetworkInterfaceIdentifier.h. That GUID gets /** EFI network interface identifier GUID (extra special version) */
* ignored by the EFI network stack. You have to use this one static EFI_GUID efi_nii31_protocol_guid = {
* instead. /* At some point, it seems that someone decided to change the
* GUID. Current EFI builds ignore the older GUID, older EFI
* builds ignore the newer GUID, so we have to expose both.
*/ */
0x1ACED566, 0x76ED, 0x4218, 0x1ACED566, 0x76ED, 0x4218,
{ 0xBC, 0x81, 0x76, 0x7F, 0x1F, 0x97, 0x7A, 0x89 } { 0xBC, 0x81, 0x76, 0x7F, 0x1F, 0x97, 0x7A, 0x89 }
@ -987,6 +989,7 @@ efi_snp_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver,
&efi_simple_network_protocol_guid, &snpdev->snp, &efi_simple_network_protocol_guid, &snpdev->snp,
&efi_device_path_protocol_guid, &snpdev->path, &efi_device_path_protocol_guid, &snpdev->path,
&efi_nii_protocol_guid, &snpdev->nii, &efi_nii_protocol_guid, &snpdev->nii,
&efi_nii31_protocol_guid, &snpdev->nii,
NULL ) ) != 0 ) { NULL ) ) != 0 ) {
DBGC ( snpdev, "SNPDEV %p could not install protocols: " DBGC ( snpdev, "SNPDEV %p could not install protocols: "
"%s\n", snpdev, efi_strerror ( efirc ) ); "%s\n", snpdev, efi_strerror ( efirc ) );
@ -1002,6 +1005,7 @@ efi_snp_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver,
&efi_simple_network_protocol_guid, &snpdev->snp, &efi_simple_network_protocol_guid, &snpdev->snp,
&efi_device_path_protocol_guid, &snpdev->path, &efi_device_path_protocol_guid, &snpdev->path,
&efi_nii_protocol_guid, &snpdev->nii, &efi_nii_protocol_guid, &snpdev->nii,
&efi_nii31_protocol_guid, &snpdev->nii,
NULL ); NULL );
err_install_protocol_interface: err_install_protocol_interface:
bs->CloseEvent ( snpdev->snp.WaitForPacket ); bs->CloseEvent ( snpdev->snp.WaitForPacket );
@ -1051,6 +1055,7 @@ efi_snp_driver_stop ( EFI_DRIVER_BINDING_PROTOCOL *driver,
&efi_simple_network_protocol_guid, &snpdev->snp, &efi_simple_network_protocol_guid, &snpdev->snp,
&efi_device_path_protocol_guid, &snpdev->path, &efi_device_path_protocol_guid, &snpdev->path,
&efi_nii_protocol_guid, &snpdev->nii, &efi_nii_protocol_guid, &snpdev->nii,
&efi_nii31_protocol_guid, &snpdev->nii,
NULL ); NULL );
bs->CloseEvent ( snpdev->snp.WaitForPacket ); bs->CloseEvent ( snpdev->snp.WaitForPacket );
netdev_put ( snpdev->netdev ); netdev_put ( snpdev->netdev );