From d6ba0f2c4a65e9debdfff36a37d3e972c8953031 Mon Sep 17 00:00:00 2001
From: Susant Sahani <susant@redhat.com>
Date: Wed, 24 Jan 2018 20:27:27 +0530
Subject: [PATCH 1/2] networkd: remove unused variable manager -> m

---
 src/network/networkd-route.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h
index 334cb1666b..6db9d592ea 100644
--- a/src/network/networkd-route.h
+++ b/src/network/networkd-route.h
@@ -26,7 +26,6 @@ typedef struct NetworkConfigSection NetworkConfigSection;
 #include "networkd-network.h"
 
 struct Route {
-        Manager *m;
         Network *network;
         NetworkConfigSection *section;
 

From 6964cf45580edee22dce501352f0c716320a872f Mon Sep 17 00:00:00 2001
From: Susant Sahani <susant@redhat.com>
Date: Wed, 24 Jan 2018 20:27:53 +0530
Subject: [PATCH 2/2] networkd: routing policy rules rename Manager object m to
 manager.

---
 src/network/networkd-routing-policy-rule.c | 8 ++++----
 src/network/networkd-routing-policy-rule.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c
index 1019b39807..fdbaec58eb 100644
--- a/src/network/networkd-routing-policy-rule.c
+++ b/src/network/networkd-routing-policy-rule.c
@@ -62,9 +62,9 @@ void routing_policy_rule_free(RoutingPolicyRule *rule) {
 
         }
 
-        if (rule->m) {
-                set_remove(rule->m->rules, rule);
-                set_remove(rule->m->rules_foreign, rule);
+        if (rule->manager) {
+                set_remove(rule->manager->rules, rule);
+                set_remove(rule->manager->rules_foreign, rule);
         }
 
         free(rule->iif);
@@ -260,7 +260,7 @@ static int routing_policy_rule_add_internal(Manager *m,
         if (r < 0)
                 return r;
 
-        rule->m = m;
+        rule->manager = m;
         rule->family = family;
         rule->from = *from;
         rule->from_prefixlen = from_prefixlen;
diff --git a/src/network/networkd-routing-policy-rule.h b/src/network/networkd-routing-policy-rule.h
index a56a2a52ef..48353b9d10 100644
--- a/src/network/networkd-routing-policy-rule.h
+++ b/src/network/networkd-routing-policy-rule.h
@@ -36,7 +36,7 @@ typedef struct NetworkConfigSection NetworkConfigSection;
 typedef struct Manager Manager;
 
 struct RoutingPolicyRule {
-        Manager *m;
+        Manager *manager;
         Network *network;
         Link *link;
         NetworkConfigSection *section;