dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0073-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: Thu, 7 Apr 2016 10:58:06 -0400
d9d99f
Subject: [PATCH] Revert "reopen SNP protocol for exclusive use by grub"
d9d99f
d9d99f
I *think* this should have been replaced by upstream's
d9d99f
49426e9fd2e562c73a4f1206f32eff9e424a1a73, so I'm reverting for now.
d9d99f
d9d99f
May resolve rhbz#1273974.
d9d99f
d9d99f
This reverts commit 147daeab22db793978f952b6f0d832919a1b0081.
d9d99f
---
d9d99f
 grub-core/net/drivers/efi/efinet.c | 39 --------------------------------------
d9d99f
 1 file changed, 39 deletions(-)
d9d99f
d9d99f
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
d9d99f
index d15a799f29a..5388f952ba9 100644
d9d99f
--- a/grub-core/net/drivers/efi/efinet.c
d9d99f
+++ b/grub-core/net/drivers/efi/efinet.c
d9d99f
@@ -383,45 +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
-
d9d99f
-      /* Enable hardware receive filters if driver declares support for it.
d9d99f
-	 We need unicast and broadcast and additionaly all nodes and
d9d99f
-	 solicited multicast for IPv6. Solicited multicast is per-IPv6
d9d99f
-	 address and we currently do not have API to do it so simply
d9d99f
-	 try to enable receive of all multicast packets or evertyhing in
d9d99f
-	 the worst case (i386 PXE driver always enables promiscuous too).
d9d99f
-
d9d99f
-	 This does trust firmware to do what it claims to do.
d9d99f
-       */
d9d99f
-      if (net->mode->receive_filter_mask)
d9d99f
-	{
d9d99f
-	  grub_uint32_t filters = GRUB_EFI_SIMPLE_NETWORK_RECEIVE_UNICAST   |
d9d99f
-				  GRUB_EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST |
d9d99f
-				  GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST;
d9d99f
-
d9d99f
-	  filters &= net->mode->receive_filter_mask;
d9d99f
-	  if (!(filters & GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST))
d9d99f
-	    filters |= (net->mode->receive_filter_mask &
d9d99f
-			GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS);
d9d99f
-
d9d99f
-	  efi_call_6 (net->receive_filters, net, filters, 0, 0, 0, NULL);
d9d99f
-	}
d9d99f
-
d9d99f
-      card->efi_net = net;
d9d99f
-    }
d9d99f
     return;
d9d99f
   }
d9d99f
 }