From: Susant Sahani <susant@redhat.com>
Date: Wed, 16 Jul 2014 08:26:24 +0000 (+0530)
Subject: sd-rtnl: uncomment bond rtnl constants
X-Git-Tag: v216~468
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=801a04c81be81f6ae1f82f8603a81891283256d9;hp=aa9f11405829fd4755fef28602a7167dba3ddc89

sd-rtnl: uncomment bond rtnl constants
---

diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c b/src/libsystemd/sd-rtnl/rtnl-types.c
index ff90895b1..df9a45dab 100644
--- a/src/libsystemd/sd-rtnl/rtnl-types.c
+++ b/src/libsystemd/sd-rtnl/rtnl-types.c
@@ -90,15 +90,12 @@ static const NLType rtnl_link_info_data_vxlan_types[IFLA_VXLAN_MAX+1] = {
 static const NLType rtnl_link_info_data_bond_types[IFLA_BOND_MAX + 1] = {
         [IFLA_BOND_MODE]                = { .type = NLA_U8 },
         [IFLA_BOND_ACTIVE_SLAVE]        = { .type = NLA_U32 },
-#ifdef IFLA_BOND_MIIMON
         [IFLA_BOND_MIIMON]              = { .type = NLA_U32 },
         [IFLA_BOND_UPDELAY]             = { .type = NLA_U32 },
         [IFLA_BOND_DOWNDELAY]           = { .type = NLA_U32 },
         [IFLA_BOND_USE_CARRIER]         = { .type = NLA_U8 },
         [IFLA_BOND_ARP_INTERVAL]        = { .type = NLA_U32 },
-/*
         [IFLA_BOND_ARP_IP_TARGET]       = { .type = NLA_NESTED },
-*/
         [IFLA_BOND_ARP_VALIDATE]        = { .type = NLA_U32 },
         [IFLA_BOND_ARP_ALL_TARGETS]     = { .type = NLA_U32 },
         [IFLA_BOND_PRIMARY]             = { .type = NLA_U32 },
@@ -113,10 +110,7 @@ static const NLType rtnl_link_info_data_bond_types[IFLA_BOND_MAX + 1] = {
         [IFLA_BOND_PACKETS_PER_SLAVE]   = { .type = NLA_U32 },
         [IFLA_BOND_AD_LACP_RATE]        = { .type = NLA_U8 },
         [IFLA_BOND_AD_SELECT]           = { .type = NLA_U8 },
-/*
         [IFLA_BOND_AD_INFO]             = { .type = NLA_NESTED },
-*/
-#endif
 };
 
 static const NLType rtnl_link_info_data_iptun_types[IFLA_IPTUN_MAX + 1] = {