networkd: Renamed table_id field to table

andir · andir · commit 62b83cf66453 · 2017-08-31T01:14:05.000+02:00
Other parts of the code do just use `table` as identifier for the actual
routing table id. This change should make it easier to read through the
code since the meaning or rather the name stays the same.
diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
@@ -133,5 +133,5 @@ Bridge.MulticastQuerier,     config_parse_tristate,                0,
 Bridge.MulticastSnooping,    config_parse_tristate,                0,                             offsetof(Bridge, mcast_snooping)
 Bridge.VLANFiltering,        config_parse_tristate,                0,                             offsetof(Bridge, vlan_filtering)
 Bridge.STP,                  config_parse_tristate,                0,                             offsetof(Bridge, stp)
-VRF.TableId,                 config_parse_uint32,                  0,                             offsetof(Vrf, table_id)
-VRF.Table,                   config_parse_route_table,             0,                             offsetof(Vrf, table_id)
+VRF.TableId,                 config_parse_uint32,                  0,                             offsetof(Vrf, table)
+VRF.Table,                   config_parse_route_table,             0,                             offsetof(Vrf, table)
diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c
@@ -35,7 +35,7 @@ static int netdev_vrf_fill_message_create(NetDev *netdev, Link *link, sd_netlink
 
         assert(v);
 
-        r = sd_netlink_message_append_u32(m, IFLA_VRF_TABLE, v->table_id);
+        r = sd_netlink_message_append_u32(m, IFLA_VRF_TABLE, v->table);
         if (r < 0)
                 return log_netdev_error_errno(netdev, r, "Could not append IPLA_VRF_TABLE attribute: %m");
 
diff --git a/src/network/netdev/vrf.h b/src/network/netdev/vrf.h
@@ -26,7 +26,7 @@ typedef struct Vrf Vrf;
 struct Vrf {
         NetDev meta;
 
-        uint32_t table_id;
+        uint32_t table;
 };
 
 DEFINE_NETDEV_CAST(VRF, Vrf);
