mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-25 06:37:33 +00:00
81987f4958
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
From c760d9ce51010c408c9cca513c5f307e9f94912a Mon Sep 17 00:00:00 2001
|
|
From: RHEL Ninjas <example@example.com>
|
|
Date: Fri, 25 Sep 2015 16:24:23 +0900
|
|
Subject: [PATCH 136/206] efinet: add filter for the first exclusive reopen of
|
|
SNP
|
|
|
|
---
|
|
grub-core/net/drivers/efi/efinet.c | 39 ++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 39 insertions(+)
|
|
|
|
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
|
|
index a3ce4c67cce..b870d3f1938 100644
|
|
--- a/grub-core/net/drivers/efi/efinet.c
|
|
+++ b/grub-core/net/drivers/efi/efinet.c
|
|
@@ -465,6 +465,45 @@ 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;
|
|
+
|
|
+ /* Enable hardware receive filters if driver declares support for it.
|
|
+ We need unicast and broadcast and additionaly all nodes and
|
|
+ solicited multicast for IPv6. Solicited multicast is per-IPv6
|
|
+ address and we currently do not have API to do it so simply
|
|
+ try to enable receive of all multicast packets or evertyhing in
|
|
+ the worst case (i386 PXE driver always enables promiscuous too).
|
|
+
|
|
+ This does trust firmware to do what it claims to do.
|
|
+ */
|
|
+ if (net->mode->receive_filter_mask)
|
|
+ {
|
|
+ grub_uint32_t filters = GRUB_EFI_SIMPLE_NETWORK_RECEIVE_UNICAST |
|
|
+ GRUB_EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST |
|
|
+ GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST;
|
|
+
|
|
+ filters &= net->mode->receive_filter_mask;
|
|
+ if (!(filters & GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST))
|
|
+ filters |= (net->mode->receive_filter_mask &
|
|
+ GRUB_EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS);
|
|
+
|
|
+ efi_call_6 (net->receive_filters, net, filters, 0, 0, 0, NULL);
|
|
+ }
|
|
+
|
|
+ card->efi_net = net;
|
|
+ }
|
|
return;
|
|
}
|
|
}
|
|
--
|
|
2.15.0
|
|
|