From 86d19526ef0f1a0b25250f06f4cef8c5fde37889 Mon Sep 17 00:00:00 2001
From: claudio <claudio@openbsd.org>
Date: Tue, 7 Jun 2022 15:57:47 +0000
Subject: [PATCH] Retire F_RTLABEL it was not used for anything. Also cleanup
 some redundant if statements. OK tb@

---
 usr.sbin/bgpd/bgpd.h   |  3 +--
 usr.sbin/bgpd/kroute.c | 15 +++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h
index 5a0a9068345..29181ce6e13 100644
--- a/usr.sbin/bgpd/bgpd.h
+++ b/usr.sbin/bgpd/bgpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bgpd.h,v 1.426 2022/06/05 12:43:13 claudio Exp $ */
+/*	$OpenBSD: bgpd.h,v 1.427 2022/06/07 15:57:47 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -90,7 +90,6 @@
 #define	F_CTL_ADJ_IN		0x2000	/* only set on requests */
 #define	F_CTL_ADJ_OUT		0x4000	/* only set on requests */
 #define	F_CTL_BEST		0x8000
-#define	F_RTLABEL		0x10000
 #define	F_CTL_SSV		0x20000	/* only used by bgpctl */
 #define	F_CTL_INVALID		0x40000 /* only set on requests */
 #define	F_CTL_OVS_VALID		0x80000
diff --git a/usr.sbin/bgpd/kroute.c b/usr.sbin/bgpd/kroute.c
index 603d535dcbc..ab7452313f9 100644
--- a/usr.sbin/bgpd/kroute.c
+++ b/usr.sbin/bgpd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.248 2022/06/05 12:43:13 claudio Exp $ */
+/*	$OpenBSD: kroute.c,v 1.249 2022/06/07 15:57:47 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -3268,7 +3268,6 @@ fetchtable(struct ktable *kt)
 			kr->r.labelid = 0;
 			if ((label = (struct sockaddr_rtlabel *)
 			    rti_info[RTAX_LABEL]) != NULL) {
-				kr->r.flags |= F_RTLABEL;
 				kr->r.labelid =
 				    rtlabel_name2id(label->sr_label);
 			}
@@ -3309,7 +3308,6 @@ fetchtable(struct ktable *kt)
 			kr6->r.labelid = 0;
 			if ((label = (struct sockaddr_rtlabel *)
 			    rti_info[RTAX_LABEL]) != NULL) {
-				kr6->r.flags |= F_RTLABEL;
 				kr6->r.labelid =
 				    rtlabel_name2id(label->sr_label);
 			}
@@ -3702,15 +3700,12 @@ dispatch_rtmsg_addr(struct rt_msghdr *rtm, struct sockaddr *rti_info[RTAX_MAX],
 					    rtlabel_name2id(label->sr_label);
 					if (kr->r.labelid != new_labelid) {
 						rtlabel_unref(kr->r.labelid);
-						kr->r.labelid = 0;
-						flags |= F_RTLABEL;
 						kr->r.labelid = new_labelid;
 						rtlabel_changed = 1;
 					}
-				} else if (kr->r.labelid && label == NULL) {
+				} else if (kr->r.labelid) {
 					rtlabel_unref(kr->r.labelid);
 					kr->r.labelid = 0;
-					flags &= ~F_RTLABEL;
 					rtlabel_changed = 1;
 				}
 
@@ -3760,7 +3755,6 @@ add4:
 			kr->r.priority = prio;
 
 			if (label) {
-				kr->r.flags |= F_RTLABEL;
 				kr->r.labelid =
 				    rtlabel_name2id(label->sr_label);
 			}
@@ -3809,14 +3803,12 @@ add4:
 					if (kr6->r.labelid != new_labelid) {
 						rtlabel_unref(kr6->r.labelid);
 						kr6->r.labelid = 0;
-						flags |= F_RTLABEL;
 						kr6->r.labelid = new_labelid;
 						rtlabel_changed = 1;
 					}
-				} else if (kr6->r.labelid && label == NULL) {
+				} else if (kr6->r.labelid) {
 					rtlabel_unref(kr6->r.labelid);
 					kr6->r.labelid = 0;
-					flags &= ~F_RTLABEL;
 					rtlabel_changed = 1;
 				}
 
@@ -3870,7 +3862,6 @@ add6:
 			kr6->r.priority = prio;
 
 			if (label) {
-				kr6->r.flags |= F_RTLABEL;
 				kr6->r.labelid =
 				    rtlabel_name2id(label->sr_label);
 			}
-- 
2.20.1