|
 |
6b2dd0f |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
6f1e3d5 |
From: Peter Jones <pjones@redhat.com>
|
|
|
6f1e3d5 |
Date: Fri, 4 Mar 2016 15:13:59 -0500
|
|
|
752ceb1 |
Subject: [PATCH] Revert "reopen SNP protocol for exclusive use by grub"
|
|
|
6f1e3d5 |
|
|
|
6f1e3d5 |
This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is
|
|
|
6f1e3d5 |
obsoleted by these:
|
|
|
6f1e3d5 |
|
|
|
6f1e3d5 |
49426e9 efinet: open Simple Network Protocol exclusively
|
|
|
6f1e3d5 |
f348aee efinet: enable hardware filters when opening interface
|
|
|
6f1e3d5 |
c52ae40 efinet: skip virtual IPv4 and IPv6 devices when enumerating cards
|
|
|
6f1e3d5 |
|
|
|
6f1e3d5 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
6f1e3d5 |
---
|
|
|
6f1e3d5 |
grub-core/net/drivers/efi/efinet.c | 16 ----------------
|
|
|
6f1e3d5 |
1 file changed, 16 deletions(-)
|
|
|
6f1e3d5 |
|
|
|
6f1e3d5 |
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
|
|
|
ec4acbb |
index ea0e0ca360e..5388f952ba9 100644
|
|
|
6f1e3d5 |
--- a/grub-core/net/drivers/efi/efinet.c
|
|
|
6f1e3d5 |
+++ b/grub-core/net/drivers/efi/efinet.c
|
|
|
6f1e3d5 |
@@ -330,7 +330,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
|
|
6f1e3d5 |
{
|
|
|
6f1e3d5 |
struct grub_net_card *card;
|
|
|
6f1e3d5 |
grub_efi_device_path_t *dp;
|
|
|
6f1e3d5 |
- grub_efi_simple_network_t *net;
|
|
|
6f1e3d5 |
|
|
|
6f1e3d5 |
dp = grub_efi_get_device_path (hnd);
|
|
|
6f1e3d5 |
if (! dp)
|
|
|
6f1e3d5 |
@@ -384,21 +383,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
|
|
6f1e3d5 |
&pxe_mode->dhcp_ack,
|
|
|
6f1e3d5 |
sizeof (pxe_mode->dhcp_ack),
|
|
|
6f1e3d5 |
1, device, path);
|
|
|
6f1e3d5 |
- net = grub_efi_open_protocol (card->efi_handle, &net_io_guid,
|
|
|
6f1e3d5 |
- GRUB_EFI_OPEN_PROTOCOL_BY_EXCLUSIVE);
|
|
|
6f1e3d5 |
- if (net) {
|
|
|
6f1e3d5 |
- if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
|
|
|
6f1e3d5 |
- && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
|
|
|
6f1e3d5 |
- continue;
|
|
|
6f1e3d5 |
-
|
|
|
6f1e3d5 |
- if (net->mode->state == GRUB_EFI_NETWORK_STOPPED)
|
|
|
6f1e3d5 |
- continue;
|
|
|
6f1e3d5 |
-
|
|
|
6f1e3d5 |
- if (net->mode->state == GRUB_EFI_NETWORK_STARTED
|
|
|
6f1e3d5 |
- && efi_call_3 (net->initialize, net, 0, 0) != GRUB_EFI_SUCCESS)
|
|
|
6f1e3d5 |
- continue;
|
|
|
6f1e3d5 |
- card->efi_net = net;
|
|
|
6f1e3d5 |
- }
|
|
|
6f1e3d5 |
return;
|
|
|
6f1e3d5 |
}
|
|
|
6f1e3d5 |
}
|