shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-09 13:57:42 +03:00
Code

Merge pull request #7988 from ssahani/follow-7712

Browse Source 
Networkd: cleanup  code a bit
This commit is contained in:
Lennart Poettering 2018-01-24 16:15:26 +01:00 committed by GitHub
commit 7d94e8a4b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/networkd-route.h
View File

@ -26,7 +26,6 @@ typedef struct NetworkConfigSection NetworkConfigSection;
#include "networkd-network.h"
struct Route {
Manager *m;
Network *network;
NetworkConfigSection *section;

8
src/network/networkd-routing-policy-rule.c
View File

@ -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;

2
src/network/networkd-routing-policy-rule.h
View File

@ -36,7 +36,7 @@ typedef struct NetworkConfigSection NetworkConfigSection;
typedef struct Manager Manager;
struct RoutingPolicyRule {
Manager *m;
Manager *manager;
Network *network;
Link *link;
NetworkConfigSection *section;