From 71522c937ee630e9716d761550d197fae235084f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 18 Nov 2023 23:48:17 +0100 Subject: [PATCH] net: Rename IFT_TUN to IFT_TUNNEL as on BSD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We already use their value, let's use the name too. Change-Id: I5afbd69923ae3b5e702dfb935a709c3069de5365 Reviewed-on: https://review.haiku-os.org/c/haiku/+/7146 Reviewed-by: Adrien Destugues Tested-by: Commit checker robot Reviewed-by: François Revol --- headers/posix/net/if_types.h | 2 +- .../datalink_protocols/loopback_frame/loopback_frame.cpp | 4 ++-- src/add-ons/kernel/network/devices/tunnel/tunnel.cpp | 2 +- src/add-ons/kernel/network/stack/stack.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/headers/posix/net/if_types.h b/headers/posix/net/if_types.h index 5f623a95bb..9d3c16ec23 100644 --- a/headers/posix/net/if_types.h +++ b/headers/posix/net/if_types.h @@ -15,7 +15,7 @@ #define IFT_SLIP 0x1c #define IFT_LOCALTALK 0x2a #define IFT_MODEM 0x30 -#define IFT_TUN 0x83 +#define IFT_TUNNEL 0x83 #define IFT_L2VLAN 0x87 #define IFT_BRIDGE 0xd1 diff --git a/src/add-ons/kernel/network/datalink_protocols/loopback_frame/loopback_frame.cpp b/src/add-ons/kernel/network/datalink_protocols/loopback_frame/loopback_frame.cpp index ff72befec3..a2828f362c 100644 --- a/src/add-ons/kernel/network/datalink_protocols/loopback_frame/loopback_frame.cpp +++ b/src/add-ons/kernel/network/datalink_protocols/loopback_frame/loopback_frame.cpp @@ -50,7 +50,7 @@ status_t loopback_frame_init(struct net_interface*interface, net_domain* domain, net_datalink_protocol** _protocol) { - if (interface->device->type != IFT_LOOP && interface->device->type != IFT_TUN) + if (interface->device->type != IFT_LOOP && interface->device->type != IFT_TUNNEL) return B_BAD_TYPE; loopback_frame_protocol* protocol; @@ -67,7 +67,7 @@ loopback_frame_init(struct net_interface*interface, net_domain* domain, if (interface->device->type == IFT_LOOP) { // Locally received buffers don't need a domain device handler, as the // buffer reception is handled internally. - } else if (interface->device->type == IFT_TUN) { + } else if (interface->device->type == IFT_TUNNEL) { status = stack->register_domain_device_handler( interface->device, B_NET_FRAME_TYPE(IFT_ETHER, ETHER_TYPE_IP), domain); if (status != B_OK) diff --git a/src/add-ons/kernel/network/devices/tunnel/tunnel.cpp b/src/add-ons/kernel/network/devices/tunnel/tunnel.cpp index 81c8ebc77f..74ffc0a2a6 100644 --- a/src/add-ons/kernel/network/devices/tunnel/tunnel.cpp +++ b/src/add-ons/kernel/network/devices/tunnel/tunnel.cpp @@ -362,7 +362,7 @@ tunnel_init(const char* name, net_device** _device) device->address.length = ETHER_ADDRESS_LENGTH; } else { device->flags = IFF_POINTOPOINT | IFF_LINK; - device->type = IFT_TUN; + device->type = IFT_TUNNEL; } status_t status = gStackModule->init_fifo(&device->send_queue, diff --git a/src/add-ons/kernel/network/stack/stack.cpp b/src/add-ons/kernel/network/stack/stack.cpp index 4762484ce3..2988219939 100644 --- a/src/add-ons/kernel/network/stack/stack.cpp +++ b/src/add-ons/kernel/network/stack/stack.cpp @@ -833,7 +833,7 @@ init_stack() // TODO: for now! register_domain_datalink_protocols(AF_INET, IFT_LOOP, "network/datalink_protocols/loopback_frame/v1", NULL); - register_domain_datalink_protocols(AF_INET, IFT_TUN, + register_domain_datalink_protocols(AF_INET, IFT_TUNNEL, "network/datalink_protocols/loopback_frame/v1", NULL); #if 0 // PPP is not (currently) included in the build register_domain_datalink_protocols(AF_INET, IFT_PPP,