|
 |
6b3c76 |
From 8db8290fc9e1e30d5c3732ae3a9c6fe9399fd5a6 Mon Sep 17 00:00:00 2001
|
|
|
a85e8e |
From: Andrei Borzenkov <arvidjaar@gmail.com>
|
|
|
a85e8e |
Date: Fri, 27 Mar 2015 18:58:57 +0300
|
|
|
6b3c76 |
Subject: [PATCH 244/261] net: trivial grub_cpu_to_XX_compile_time cleanup
|
|
|
a85e8e |
|
|
|
a85e8e |
---
|
|
|
a85e8e |
grub-core/net/arp.c | 2 +-
|
|
|
a85e8e |
grub-core/net/icmp6.c | 4 ++--
|
|
|
a85e8e |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
a85e8e |
|
|
|
a85e8e |
diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
|
|
|
6b3c76 |
index 6cc580d6f..996473e10 100644
|
|
|
a85e8e |
--- a/grub-core/net/arp.c
|
|
|
a85e8e |
+++ b/grub-core/net/arp.c
|
|
|
a85e8e |
@@ -80,7 +80,7 @@ grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
|
|
|
a85e8e |
arp_packet = (struct arppkt *) nb.data;
|
|
|
a85e8e |
arp_packet->hrd = grub_cpu_to_be16_compile_time (GRUB_NET_ARPHRD_ETHERNET);
|
|
|
a85e8e |
arp_packet->hln = 6;
|
|
|
a85e8e |
- arp_packet->pro = grub_cpu_to_be16 (GRUB_NET_ETHERTYPE_IP);
|
|
|
a85e8e |
+ arp_packet->pro = grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP);
|
|
|
a85e8e |
arp_packet->pln = 4;
|
|
|
a85e8e |
arp_packet->op = grub_cpu_to_be16_compile_time (ARP_REQUEST);
|
|
|
a85e8e |
/* Sender hardware address. */
|
|
|
a85e8e |
diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c
|
|
|
6b3c76 |
index 782239460..7953e68ec 100644
|
|
|
a85e8e |
--- a/grub-core/net/icmp6.c
|
|
|
a85e8e |
+++ b/grub-core/net/icmp6.c
|
|
|
a85e8e |
@@ -552,8 +552,8 @@ grub_net_icmp6_send_router_solicit (struct grub_net_network_level_interface *inf
|
|
|
a85e8e |
struct icmp_header *icmphr;
|
|
|
a85e8e |
|
|
|
a85e8e |
multicast.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6;
|
|
|
a85e8e |
- multicast.ipv6[0] = grub_cpu_to_be64 (0xff02ULL << 48);
|
|
|
a85e8e |
- multicast.ipv6[1] = grub_cpu_to_be64 (0x02ULL);
|
|
|
a85e8e |
+ multicast.ipv6[0] = grub_cpu_to_be64_compile_time (0xff02ULL << 48);
|
|
|
a85e8e |
+ multicast.ipv6[1] = grub_cpu_to_be64_compile_time (0x02ULL);
|
|
|
a85e8e |
|
|
|
a85e8e |
err = grub_net_link_layer_resolve (inf, &multicast, &ll_multicast);
|
|
|
a85e8e |
if (err)
|
|
|
6b3c76 |
--
|
|
|
6b3c76 |
2.13.5
|
|
|
6b3c76 |
|