mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +00:00
53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
|
From a78e0a65325ad61e378acbf8facc94497c519787 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Jones <pjones@redhat.com>
|
||
|
|
Date: Thu, 7 Apr 2016 10:58:06 -0400
|
||
|
|
Subject: [PATCH 54/89] Revert "reopen SNP protocol for exclusive use by grub"
|
||
|
|
|
||
|
|
I *think* this should have been replaced by upstream's
|
||
|
|
49426e9fd2e562c73a4f1206f32eff9e424a1a73, so I'm reverting for now.
|
||
|
|
|
||
|
|
May resolve rhbz#1251600 .
|
||
|
|
|
||
|
|
This reverts commit 27e661936f8f001100c143036749a0e620d63cbf.
|
||
|
|
---
|
||
|
|
grub-core/net/drivers/efi/efinet.c | 16 ----------------
|
||
|
|
1 file changed, 16 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
|
||
|
|
index ea0e0ca..5388f95 100644
|
||
|
|
--- a/grub-core/net/drivers/efi/efinet.c
|
||
|
|
+++ b/grub-core/net/drivers/efi/efinet.c
|
||
|
|
@@ -330,7 +330,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||
|
|
{
|
||
|
|
struct grub_net_card *card;
|
||
|
|
grub_efi_device_path_t *dp;
|
||
|
|
- grub_efi_simple_network_t *net;
|
||
|
|
|
||
|
|
dp = grub_efi_get_device_path (hnd);
|
||
|
|
if (! dp)
|
||
|
|
@@ -384,21 +383,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||
|
|
&pxe_mode->dhcp_ack,
|
||
|
|
sizeof (pxe_mode->dhcp_ack),
|
||
|
|
1, device, path);
|
||
|
|
- net = grub_efi_open_protocol (card->efi_handle, &net_io_guid,
|
||
|
|
- GRUB_EFI_OPEN_PROTOCOL_BY_EXCLUSIVE);
|
||
|
|
- if (net) {
|
||
|
|
- if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
|
||
|
|
- && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
|
||
|
|
- continue;
|
||
|
|
-
|
||
|
|
- if (net->mode->state == GRUB_EFI_NETWORK_STOPPED)
|
||
|
|
- continue;
|
||
|
|
-
|
||
|
|
- if (net->mode->state == GRUB_EFI_NETWORK_STARTED
|
||
|
|
- && efi_call_3 (net->initialize, net, 0, 0) != GRUB_EFI_SUCCESS)
|
||
|
|
- continue;
|
||
|
|
- card->efi_net = net;
|
||
|
|
- }
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.5.5
|
||
|
|
|