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