diff options
| author | Diane Bruce <db@FreeBSD.org> | 2016-10-18 14:23:50 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2016-10-18 14:23:50 +0000 |
| commit | 38c39dd8da26df3cd84cc043d22e8e2d73d6fbd8 (patch) | |
| tree | 028a336343266b8728e83f43e75f0d2c2799b4da /sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__net.c | |
| parent | net/quagga: Update 1.0.20160315 -> 1.0.20161017 (diff) | |
Initial u-boot port for the Raspberry Pi 3
Diffstat (limited to 'sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__net.c')
| -rw-r--r-- | sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__net.c | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__net.c b/sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__net.c new file mode 100644 index 000000000000..a0acc44b4c9a --- /dev/null +++ b/sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__net.c @@ -0,0 +1,48 @@ +--- lib/efi_loader/efi_net.c.orig 2016-09-12 14:05:51 UTC ++++ lib/efi_loader/efi_net.c +@@ -27,7 +27,8 @@ struct efi_net_obj { + struct efi_simple_network net; + struct efi_simple_network_mode net_mode; + /* Device path to the network adapter */ +- struct efi_device_path_file_path dp[2]; ++ struct efi_device_path_mac_addr dp_mac; ++ struct efi_device_path_file_path dp_end; + /* PXE struct to transmit dhcp data */ + struct efi_pxe pxe; + struct efi_pxe_mode pxe_mode; +@@ -198,7 +199,7 @@ static efi_status_t efi_net_open_dp(void + struct efi_simple_network *net = handle; + struct efi_net_obj *netobj = container_of(net, struct efi_net_obj, net); + +- *protocol_interface = netobj->dp; ++ *protocol_interface = &netobj->dp_mac; + + return EFI_SUCCESS; + } +@@ -229,11 +230,10 @@ void efi_net_set_dhcp_ack(void *pkt, int + int efi_net_register(void **handle) + { + struct efi_net_obj *netobj; +- struct efi_device_path_file_path dp_net = { +- .dp.type = DEVICE_PATH_TYPE_MEDIA_DEVICE, +- .dp.sub_type = DEVICE_PATH_SUB_TYPE_FILE_PATH, ++ struct efi_device_path_mac_addr dp_net = { ++ .dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE, ++ .dp.sub_type = DEVICE_PATH_SUB_TYPE_MSG_MAC_ADDR, + .dp.length = sizeof(dp_net), +- .str = { 'N', 'e', 't' }, + }; + struct efi_device_path_file_path dp_end = { + .dp.type = DEVICE_PATH_TYPE_END, +@@ -272,8 +272,9 @@ int efi_net_register(void **handle) + netobj->net.receive = efi_net_receive; + netobj->net.mode = &netobj->net_mode; + netobj->net_mode.state = EFI_NETWORK_STARTED; +- netobj->dp[0] = dp_net; +- netobj->dp[1] = dp_end; ++ netobj->dp_mac = dp_net; ++ netobj->dp_end = dp_end; ++ memcpy(netobj->dp_mac.mac.addr, eth_get_ethaddr(), 6); + memcpy(netobj->net_mode.current_address.mac_addr, eth_get_ethaddr(), 6); + netobj->net_mode.max_packet_size = PKTSIZE; + |