network: rename Neighbor.MACAddress= to Neighbor.LinkLayerAddress=

And make it support IPv4 address.

Closes #13015.

1 files changed, 13 insertions, 2 deletions

diff --git a/src/network/networkd-neighbor.h b/src/network/networkd-neighbor.h
index f591f0b03f..59cd82ac11 100644
--- a/src/network/networkd-neighbor.h
+++ b/src/network/networkd-neighbor.h
@@ -15,6 +15,13 @@ typedef struct Neighbor Neighbor;
 #include "networkd-network.h"
 #include "networkd-util.h"
 
+typedef enum {
+        NEIGHBOR_LLADDR_MAC,
+        NEIGHBOR_LLADDR_IP,
+        _NEIGHBOR_LLADDR_MAX,
+        _NEIGHBOR_LLADDR_INVALID = -1,
+} NeighborLLAddressType;
+
 struct Neighbor {
         Network *network;
         Link *link;
@@ -22,8 +29,11 @@ struct Neighbor {
 
         int family;
         union in_addr_union in_addr;
-        bool mac_configured;
-        struct ether_addr mac;
+        union {
+                struct ether_addr mac;
+                union in_addr_union ip;
+        } lladdr;
+        NeighborLLAddressType lladdr_type;
 
         LIST_FIELDS(Neighbor, neighbors);
 };
@@ -36,3 +46,4 @@ int neighbor_configure(Neighbor *neighbor, Link *link, link_netlink_message_hand
 
 CONFIG_PARSER_PROTOTYPE(config_parse_neighbor_address);
 CONFIG_PARSER_PROTOTYPE(config_parse_neighbor_hwaddr);
+CONFIG_PARSER_PROTOTYPE(config_parse_neighbor_lladdr);