|
 |
f4c76c0 |
From 65d576323537049aff86ec5166d5780613c73ffe Mon Sep 17 00:00:00 2001
|
|
|
f4c76c0 |
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
|
|
f4c76c0 |
Date: Sat, 15 Feb 2014 15:10:22 -0500
|
|
|
f4c76c0 |
Subject: [PATCH 50/74] reopen SNP protocol for exclusive use by grub
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
---
|
|
|
f4c76c0 |
grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++
|
|
|
f4c76c0 |
1 file changed, 16 insertions(+)
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
|
|
|
f4c76c0 |
index 70b26af..7b8c4a5 100644
|
|
|
f4c76c0 |
--- a/grub-core/net/drivers/efi/efinet.c
|
|
|
f4c76c0 |
+++ b/grub-core/net/drivers/efi/efinet.c
|
|
|
f4c76c0 |
@@ -329,6 +329,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
|
|
f4c76c0 |
{
|
|
|
f4c76c0 |
struct grub_net_card *card;
|
|
|
f4c76c0 |
grub_efi_device_path_t *dp;
|
|
|
f4c76c0 |
+ grub_efi_simple_network_t *net;
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
dp = grub_efi_get_device_path (hnd);
|
|
|
f4c76c0 |
if (! dp)
|
|
|
f4c76c0 |
@@ -382,6 +383,21 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
|
|
f4c76c0 |
&pxe_mode->dhcp_ack,
|
|
|
f4c76c0 |
sizeof (pxe_mode->dhcp_ack),
|
|
|
f4c76c0 |
1, device, path);
|
|
|
f4c76c0 |
+ net = grub_efi_open_protocol (card->efi_handle, &net_io_guid,
|
|
|
f4c76c0 |
+ GRUB_EFI_OPEN_PROTOCOL_BY_EXCLUSIVE);
|
|
|
f4c76c0 |
+ if (net) {
|
|
|
f4c76c0 |
+ if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
|
|
|
f4c76c0 |
+ && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
|
|
|
f4c76c0 |
+ continue;
|
|
|
f4c76c0 |
+
|
|
|
f4c76c0 |
+ if (net->mode->state == GRUB_EFI_NETWORK_STOPPED)
|
|
|
f4c76c0 |
+ continue;
|
|
|
f4c76c0 |
+
|
|
|
f4c76c0 |
+ if (net->mode->state == GRUB_EFI_NETWORK_STARTED
|
|
|
f4c76c0 |
+ && efi_call_3 (net->initialize, net, 0, 0) != GRUB_EFI_SUCCESS)
|
|
|
f4c76c0 |
+ continue;
|
|
|
f4c76c0 |
+ card->efi_net = net;
|
|
|
f4c76c0 |
+ }
|
|
|
f4c76c0 |
return;
|
|
|
f4c76c0 |
}
|
|
|
f4c76c0 |
}
|
|
|
f4c76c0 |
--
|
|
|
f4c76c0 |
2.4.3
|
|
|
f4c76c0 |
|