From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Tue, 23 Jan 2018 13:48:07 +0000 (+0100)
Subject: KRT: Remove useless option
X-Git-Tag: v2.0.2~2^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5ff7929c4d85b84496cdfc46f006b8cd1b4c0e5;p=thirdparty%2Fbird.git

KRT: Remove useless option
---

diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y
index 1cb283893..31f5f1d4b 100644
--- a/sysdep/unix/krt.Y
+++ b/sysdep/unix/krt.Y
@@ -78,7 +78,6 @@ kern_item:
 	cf_error("Learning of kernel routes not supported on this platform");
 #endif
    }
- | DEVICE ROUTES bool { THIS_KRT->devroutes = $3; }
  | GRACEFUL RESTART bool { THIS_KRT->graceful_restart = $3; }
  | MERGE PATHS bool kern_mp_limit {
       krt_set_merge_paths(this_channel, $3, $4);
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 29d2d01ee..d4c0db725 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -1159,7 +1159,7 @@ krt_reconfigure(struct proto *p, struct proto_config *CF)
     return 0;
 
   /* persist, graceful restart need not be the same */
-  return o->scan_time == n->scan_time && o->learn == n->learn && o->devroutes == n->devroutes;
+  return o->scan_time == n->scan_time && o->learn == n->learn;
 }
 
 struct proto_config *
diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
index 3bfccfc2c..8d3add0eb 100644
--- a/sysdep/unix/krt.h
+++ b/sysdep/unix/krt.h
@@ -49,7 +49,6 @@ struct krt_config {
   btime scan_time;		/* How often we re-scan routes */
   int persist;			/* Keep routes when we exit */
   int learn;			/* Learn routes from other sources */
-  int devroutes;		/* XXX: remove */
   int graceful_restart;		/* Regard graceful restart recovery */
 };