From fc089a1673d06865c6a4667eaf21b76d8ee2ec31 Mon Sep 17 00:00:00 2001 From: Piotr Tworek Date: Mon, 11 Jan 2021 00:05:48 +0100 Subject: [PATCH] nic_dump: Remove unused Net::Interface::_alloc This private member variable is not used anywhere in the code. This breaks builds using clang instead of GCC. Drop the variable. Issue #3984 --- repos/os/src/server/nic_dump/component.cc | 3 +-- repos/os/src/server/nic_dump/interface.cc | 2 -- repos/os/src/server/nic_dump/interface.h | 2 -- repos/os/src/server/nic_dump/uplink.cc | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/repos/os/src/server/nic_dump/component.cc b/repos/os/src/server/nic_dump/component.cc index 0c04e89ed2..e4de127087 100644 --- a/repos/os/src/server/nic_dump/component.cc +++ b/repos/os/src/server/nic_dump/component.cc @@ -73,8 +73,7 @@ Net::Session_component::Session_component(Ram_quota const ram_quota, Session_rpc_object(env.rm(), _tx_buf, _rx_buf, &_range_alloc, env.ep().rpc_ep()), Interface(env.ep(), config.attribute_value("downlink", Interface_label()), - timer, curr_time, config.attribute_value("time", false), - Session_component_base::_alloc, config), + timer, curr_time, config.attribute_value("time", false), config), _uplink(env, config, timer, curr_time, Session_component_base::_alloc), _link_state_handler(env.ep(), *this, &Session_component::_handle_link_state) { diff --git a/repos/os/src/server/nic_dump/interface.cc b/repos/os/src/server/nic_dump/interface.cc index 5af99e90b5..2936c1a5c8 100644 --- a/repos/os/src/server/nic_dump/interface.cc +++ b/repos/os/src/server/nic_dump/interface.cc @@ -96,14 +96,12 @@ Net::Interface::Interface(Entrypoint &ep, Timer::Connection &timer, Duration &curr_time, bool log_time, - Allocator &alloc, Xml_node config) : _sink_ack { ep, *this, &Interface::_ack_avail }, _sink_submit { ep, *this, &Interface::_ready_to_submit }, _source_ack { ep, *this, &Interface::_ready_to_ack }, _source_submit { ep, *this, &Interface::_packet_avail }, - _alloc { alloc }, _label { label }, _timer { timer }, _curr_time { curr_time }, diff --git a/repos/os/src/server/nic_dump/interface.h b/repos/os/src/server/nic_dump/interface.h index 3d65dfa29d..faa3302222 100644 --- a/repos/os/src/server/nic_dump/interface.h +++ b/repos/os/src/server/nic_dump/interface.h @@ -49,7 +49,6 @@ class Net::Interface private: - Genode::Allocator &_alloc; Pointer _remote { }; Interface_label _label; Timer::Connection &_timer; @@ -85,7 +84,6 @@ class Net::Interface Timer::Connection &timer, Genode::Duration &curr_time, bool log_time, - Genode::Allocator &alloc, Genode::Xml_node config); virtual ~Interface() { } diff --git a/repos/os/src/server/nic_dump/uplink.cc b/repos/os/src/server/nic_dump/uplink.cc index c7ae1915e8..2ee4035458 100644 --- a/repos/os/src/server/nic_dump/uplink.cc +++ b/repos/os/src/server/nic_dump/uplink.cc @@ -32,7 +32,7 @@ Net::Uplink::Uplink(Env &env, Nic::Connection { env, this, BUF_SIZE, BUF_SIZE }, Net::Interface { env.ep(), config.attribute_value("uplink", Interface_label()), timer, curr_time, config.attribute_value("time", false), - alloc, config } + config } { rx_channel()->sigh_ready_to_ack(_sink_ack); rx_channel()->sigh_packet_avail(_sink_submit);