update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / seastar / include / seastar / net / arp.hh

diff --git a/ceph/src/seastar/include/seastar/net/arp.hh b/ceph/src/seastar/include/seastar/net/arp.hh
index 51f540b80e5427600a462f1393a4a3a1a970e078..043e0b00b1ca2c810c44bc172d5542f4f9e5873b 100644 (file)
--- a/ceph/src/seastar/include/seastar/net/arp.hh
+++ b/ceph/src/seastar/include/seastar/net/arp.hh
@@ -23,7 +23,6 @@
 #pragma once
 
 #include <seastar/net/net.hh>
-#include <seastar/core/reactor.hh>
 #include <seastar/core/byteorder.hh>
 #include <seastar/net/ethernet.hh>
 #include <unordered_map>
@@ -74,7 +73,7 @@ private:
     ethernet_address l2self() { return _netif->hw_address(); }
     future<> process_packet(packet p, ethernet_address from);
     bool forward(forward_hash& out_hash_data, packet& p, size_t off);
-    compat::optional<l3_protocol::l3packet> get_packet();
+    std::optional<l3_protocol::l3packet> get_packet();
     template <class l3_proto>
     friend class arp_for;
 };