summaryrefslogtreecommitdiffstats
path: root/eigrpd/eigrp_macros.h
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-09-07 02:12:46 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-10-03 01:51:49 +0200
commit79b3087675c7c4cc6c0693ca205c02b76c45525a (patch)
tree8983d08fd716f937cdf8533922fc6d165bc3fadc /eigrpd/eigrp_macros.h
parentMerge pull request #1259 from qlyoung/vtysh-warn-mi (diff)
downloadfrr-79b3087675c7c4cc6c0693ca205c02b76c45525a.tar.xz
frr-79b3087675c7c4cc6c0693ca205c02b76c45525a.zip
eigrpd: Start fixing eigrp_interface
The EIGRP interface handling code created 2 levels of interface information, the ei( created per *connected* address?????) and the ifp->info pointer. Start the combination of pushing these together and cleaning up the weirdness that is these two data structures. This commit probably breaks eigrp's handling of interfaces. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'eigrpd/eigrp_macros.h')
-rw-r--r--eigrpd/eigrp_macros.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/eigrpd/eigrp_macros.h b/eigrpd/eigrp_macros.h
index fdb84673d..7a803fdbf 100644
--- a/eigrpd/eigrp_macros.h
+++ b/eigrpd/eigrp_macros.h
@@ -29,9 +29,9 @@
#define _ZEBRA_EIGRP_MACROS_H_
#define DECLARE_IF_PARAM(T, P) T P; u_char P##__config:1
-#define IF_EIGRP_IF_INFO(I) ((struct eigrp_if_info *)((I)->info))
+#define IF_EIGRP_IF_INFO(I) ((struct eigrp_interface *)((I)->info))
#define IF_OIFS(I) (IF_EIGRP_IF_INFO (I)->eifs)
-#define IF_OIFS_PARAMS(I) (IF_EIGRP_IF_INFO (I)->params)
+#define IF_OIFS_PARAMS(I) (IF_EIGRP_IF_INFO (I)->eparams)
#define SET_IF_PARAM(S, P) ((S)->P##__config) = 1
#define IF_DEF_PARAMS(I) (IF_EIGRP_IF_INFO (I)->def_params)