From: Maria Matejka <mq@ucw.cz>
Date: Mon, 17 Feb 2020 11:55:11 +0000 (+0100)
Subject: Cleaning up also the rte_same hook which is never set
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cbeefc2ac0bc228c62128ae8445141442510c31;p=thirdparty%2Fbird.git

Cleaning up also the rte_same hook which is never set
---

diff --git a/nest/proto-hooks.c b/nest/proto-hooks.c
index 716ce86c8..9b000c173 100644
--- a/nest/proto-hooks.c
+++ b/nest/proto-hooks.c
@@ -274,21 +274,6 @@ int rte_recalculate(struct rtable *table, struct network *net, struct rte *new,
 int rte_better(rte *new, rte *old)
 { DUMMY; }
 
-/**
- * rte_same - compare two routes
- * @e1: route
- * @e2: route
- *
- * The rte_same() hook tests whether the routes @e1 and @e2 belonging
- * to the same protocol instance have identical contents. Contents of
- * &rta, all the extended attributes and &rte preference are checked
- * by the core code, no need to take care of them here.
- *
- * Result: 1 if @e1 is identical to @e2, 0 otherwise.
- */
-int rte_same(rte *e1, rte *e2)
-{ DUMMY; }
-
 /**
  * rte_insert - notify instance about route insertion
  * @n: network
diff --git a/nest/protocol.h b/nest/protocol.h
index 7be056d7b..817fd35a3 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -222,7 +222,6 @@ struct proto {
    *
    *	   rte_recalculate Called at the beginning of the best route selection
    *	   rte_better	Compare two rte's and decide which one is better (1=first, 0=second).
-   *       rte_same	Compare two rte's and decide whether they are identical (1=yes, 0=no).
    *       rte_mergable	Compare two rte's and decide whether they could be merged (1=yes, 0=no).
    *	   rte_insert	Called whenever a rte is inserted to a routing table.
    *	   rte_remove	Called whenever a rte is removed from the routing table.
@@ -230,7 +229,6 @@ struct proto {
 
   int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
   int (*rte_better)(struct rte *, struct rte *);
-  int (*rte_same)(struct rte *, struct rte *);
   int (*rte_mergable)(struct rte *, struct rte *);
   struct rte * (*rte_modify)(struct rte *, struct linpool *);
   void (*rte_insert)(struct network *, struct rte *);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 967294a45..4654c3dba 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -902,8 +902,6 @@ rte_same(rte *x, rte *y)
   /* rte.flags are not checked, as they are mostly internal to rtable */
   return
     x->attrs == y->attrs &&
-    x->pflags == y->pflags &&
-    (!x->attrs->src->proto->rte_same || x->attrs->src->proto->rte_same(x, y)) &&
     rte_is_filtered(x) == rte_is_filtered(y);
 }