dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0053-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

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