From 82aa4a0f4eb05d13d34dd932566cc2feb8d922e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 4 Dec 2009 09:34:35 +0000 Subject: [PATCH] * Replaced the remaining AF_DLI references with AF_LINK. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34487 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/network/datalink_protocols/arp/arp.cpp | 8 ++++---- .../ethernet_frame/ethernet_frame.cpp | 4 ++-- .../kernel/network/devices/ethernet/ethernet.cpp | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp b/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp index 0d4dbee9a2..6c3ad9fdd8 100644 --- a/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp +++ b/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp @@ -327,7 +327,7 @@ ipv4_to_ether_multicast(sockaddr_dl *destination, const sockaddr_in *source) // 01-00-5E-00-00-00 (hex).'' destination->sdl_len = sizeof(sockaddr_dl); - destination->sdl_family = AF_DLI; + destination->sdl_family = AF_LINK; destination->sdl_index = 0; destination->sdl_type = IFT_ETHER; destination->sdl_e_type = ETHER_TYPE_IP; @@ -424,7 +424,7 @@ arp_update_local(arp_protocol *protocol) sockaddr_dl address; address.sdl_len = sizeof(sockaddr_dl); - address.sdl_family = AF_DLI; + address.sdl_family = AF_LINK; address.sdl_type = IFT_ETHER; address.sdl_e_type = ETHER_TYPE_IP; address.sdl_nlen = 0; @@ -703,7 +703,7 @@ arp_start_resolve(net_datalink_protocol *protocol, in_addr_t address, struct sockaddr_dl &source = *(struct sockaddr_dl *) entry->request_buffer->source; source.sdl_len = sizeof(sockaddr_dl); - source.sdl_family = AF_DLI; + source.sdl_family = AF_LINK; source.sdl_index = device->index; source.sdl_type = IFT_ETHER; source.sdl_e_type = ETHER_TYPE_ARP; @@ -742,7 +742,7 @@ arp_control(const char *subsystem, uint32 function, void *buffer, sockaddr_dl hardwareAddress; hardwareAddress.sdl_len = sizeof(sockaddr_dl); - hardwareAddress.sdl_family = AF_DLI; + hardwareAddress.sdl_family = AF_LINK; hardwareAddress.sdl_index = 0; hardwareAddress.sdl_type = IFT_ETHER; hardwareAddress.sdl_e_type = ETHER_TYPE_IP; diff --git a/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp b/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp index cda9715dc7..52c15da78b 100644 --- a/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp +++ b/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku, Inc. All Rights Reserved. + * Copyright 2006-2009, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -122,7 +122,7 @@ ethernet_frame_send_data(net_datalink_protocol *protocol, struct sockaddr_dl &source = *(struct sockaddr_dl *)buffer->source; struct sockaddr_dl &destination = *(struct sockaddr_dl *)buffer->destination; - if (source.sdl_family != AF_DLI || source.sdl_type != IFT_ETHER) + if (source.sdl_family != AF_LINK || source.sdl_type != IFT_ETHER) return B_ERROR; NetBufferPrepend bufferHeader(buffer); diff --git a/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp b/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp index 7539e2f547..3e1c5677aa 100644 --- a/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp +++ b/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007, Haiku, Inc. All Rights Reserved. + * Copyright 2006-2009, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -384,12 +384,12 @@ ethernet_add_multicast(struct net_device *_device, const sockaddr *_address) { ethernet_device *device = (ethernet_device *)_device; - if (_address->sa_family != AF_DLI) - return EINVAL; + if (_address->sa_family != AF_LINK) + return B_BAD_VALUE; const sockaddr_dl *address = (const sockaddr_dl *)_address; if (address->sdl_type != IFT_ETHER) - return EINVAL; + return B_BAD_VALUE; return ioctl(device->fd, ETHER_ADDMULTI, LLADDR(address), 6); } @@ -400,12 +400,12 @@ ethernet_remove_multicast(struct net_device *_device, const sockaddr *_address) { ethernet_device *device = (ethernet_device *)_device; - if (_address->sa_family != AF_DLI) - return EINVAL; + if (_address->sa_family != AF_LINK) + return B_BAD_VALUE; const sockaddr_dl *address = (const sockaddr_dl *)_address; if (address->sdl_type != IFT_ETHER) - return EINVAL; + return B_BAD_VALUE; return ioctl(device->fd, ETHER_REMMULTI, LLADDR(address), 6); }