diff options
| author | Simon Rettberg | 2018-09-13 15:45:29 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-09-13 15:45:29 +0200 |
| commit | 53a91d5caf08276d2cbf0de468e1a5e46537454c (patch) | |
| tree | 3f53a6403785de9f2feebf25d1d82b55656d3456 /src/interface | |
| parent | [settings] Add md5 encoding type for doing ${foo:md5} (diff) | |
| parent | [sfc] Add support for X25xx adapters (diff) | |
| download | ipxe-53a91d5caf08276d2cbf0de468e1a5e46537454c.tar.gz ipxe-53a91d5caf08276d2cbf0de468e1a5e46537454c.tar.xz ipxe-53a91d5caf08276d2cbf0de468e1a5e46537454c.zip | |
Merge branch 'master' into openslx
Diffstat (limited to 'src/interface')
| -rw-r--r-- | src/interface/efi/efi_snp.c | 2 | ||||
| -rw-r--r-- | src/interface/hyperv/vmbus.c | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c index 3f95a8961..9c1b14d87 100644 --- a/src/interface/efi/efi_snp.c +++ b/src/interface/efi/efi_snp.c @@ -123,7 +123,7 @@ static void efi_snp_set_mode ( struct efi_snp_device *snpdev ) { mode->HwAddressSize = ll_addr_len; mode->MediaHeaderSize = ll_protocol->ll_header_len; - mode->MaxPacketSize = netdev->max_pkt_len; + mode->MaxPacketSize = netdev->mtu; mode->ReceiveFilterMask = ( EFI_SIMPLE_NETWORK_RECEIVE_UNICAST | EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST | EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST ); diff --git a/src/interface/hyperv/vmbus.c b/src/interface/hyperv/vmbus.c index 45a7caec4..e50fe9951 100644 --- a/src/interface/hyperv/vmbus.c +++ b/src/interface/hyperv/vmbus.c @@ -195,16 +195,10 @@ static int vmbus_initiate_contact ( struct hv_hypervisor *hv, vmbus ); return -ENOTSUP; } - if ( version->version.raw != cpu_to_le32 ( raw ) ) { - DBGC ( vmbus, "VMBUS %p unexpected version %d.%d\n", - vmbus, le16_to_cpu ( version->version.major ), - le16_to_cpu ( version->version.minor ) ); - return -EPROTO; - } DBGC ( vmbus, "VMBUS %p initiated contact using version %d.%d\n", - vmbus, le16_to_cpu ( version->version.major ), - le16_to_cpu ( version->version.minor ) ); + vmbus, le16_to_cpu ( initiate.version.major ), + le16_to_cpu ( initiate.version.minor ) ); return 0; } |