56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
|
From 88892eedb9beb9d8c295329fad87edb339e4e27c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Jones <pjones@redhat.com>
|
||
|
|
Date: Fri, 4 Mar 2016 15:13:59 -0500
|
||
|
|
Subject: [PATCH 118/198] Revert "reopen SNP protocol for exclusive use by
|
||
|
|
grub"
|
||
|
|
|
||
|
|
This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is
|
||
|
|
obsoleted by these:
|
||
|
|
|
||
|
|
49426e9 efinet: open Simple Network Protocol exclusively
|
||
|
|
f348aee efinet: enable hardware filters when opening interface
|
||
|
|
c52ae40 efinet: skip virtual IPv4 and IPv6 devices when enumerating cards
|
||
|
|
|
||
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||
|
|
---
|
||
|
|
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 ea0e0ca36..5388f952b 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.14.3
|
||
|
|
|