From e1fac9980d27bbef124fd40084b7a591064b50b6 Mon Sep 17 00:00:00 2001 From: Sylvain Gault Date: Tue, 25 Aug 2015 03:29:56 +0200 Subject: [PATCH 1/3] efi: fix warnings about argument types The function efi_get_MAC was given a pointer to array instead of a simple pointer, generating a warning with gcc. Signed-off-by: Sylvain Gault --- efi/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/efi/main.c b/efi/main.c index 6dbc259e0..8e08d4f96 100644 --- a/efi/main.c +++ b/efi/main.c @@ -105,13 +105,13 @@ struct efi_binding *efi_create_binding(EFI_GUID *bguid, EFI_GUID *pguid) status = EFI_UNSUPPORTED; goto free_binding; } - efi_get_MAC(DevicePath, &mac_1, PXE_MAC_LENGTH); + efi_get_MAC(DevicePath, mac_1, PXE_MAC_LENGTH); status = LibLocateHandle(ByProtocol, bguid, NULL, &nr_handles, &handles); if (status != EFI_SUCCESS) goto free_binding; for (i = 0; i < nr_handles; i++) { DevicePath = DevicePathFromHandle(handles[i]); - if (efi_get_MAC(DevicePath, &mac_2, PXE_MAC_LENGTH) + if (efi_get_MAC(DevicePath, mac_2, PXE_MAC_LENGTH) && memcmp(mac_1, mac_2, PXE_MAC_LENGTH) == 0) { sb_handle = handles[i]; status = uefi_call_wrapper(BS->OpenProtocol, 6, sb_handle, From f750b7745562963f8d985a0fea70a1c3f024510e Mon Sep 17 00:00:00 2001 From: Sylvain Gault Date: Tue, 25 Aug 2015 03:50:48 +0200 Subject: [PATCH 2/3] efi: fix pointer-type mismatch assigment warning The assignment looks suspicious but is actually legit since it is protected by the type check. Signed-off-by: Sylvain Gault --- efi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/efi/main.c b/efi/main.c index 8e08d4f96..7d9d51519 100644 --- a/efi/main.c +++ b/efi/main.c @@ -63,7 +63,7 @@ bool efi_get_MAC( EFI_DEVICE_PATH * pDevPath, uint8_t * mac, uint16_t mac_size) /* Find the handler to dump this device path node */ if (DevicePathType(DevPathNode) == MESSAGING_DEVICE_PATH && DevicePathSubType(DevPathNode) == MSG_MAC_ADDR_DP) { - MAC = DevPathNode; + MAC = (MAC_ADDR_DEVICE_PATH *)DevPathNode; CopyMem(mac, MAC->MacAddress.Addr, PXE_MAC_LENGTH); FreePool(pDevPath); return TRUE; From 9c8186b47649e5710e75c968b097aea6e3cb86e9 Mon Sep 17 00:00:00 2001 From: Sylvain Gault Date: Tue, 25 Aug 2015 03:31:43 +0200 Subject: [PATCH 3/3] efi: fix warning about unused variable Signed-off-by: Sylvain Gault --- efi/pxe.c | 1 - 1 file changed, 1 deletion(-) diff --git a/efi/pxe.c b/efi/pxe.c index 43009478e..1b3a460df 100644 --- a/efi/pxe.c +++ b/efi/pxe.c @@ -96,7 +96,6 @@ void net_parse_dhcp(void) uint8_t hardlen; uint32_t ip; char dst[256]; - UINTN i = 0; status = uefi_call_wrapper(BS->HandleProtocol, 3, image_device_handle, &PxeBaseCodeProtocol, (void **)&bc);