diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-06-08 23:34:11 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-06-08 23:34:11 +0200 |
| commit | 4d1f0021d341925fe13eccbf006c6e65c816c1d1 (patch) | |
| tree | 72cd0535aac68878929c3121e79153f300fd4ba2 /src/network | |
| parent | 3edf03546d707369ce4ab62968640a6f01bc8972 (diff) | |
| parent | ee0eb1d891eb0a41fb63368bff264f59cb2bb851 (diff) | |
Merge pull request #110 from systemd/revert-41-ipforwarding
Revert "networkd: create "kernel" setting for IPForwarding"
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/networkd-link.c | 6 | ||||
| -rw-r--r-- | src/network/networkd-manager.c | 4 | ||||
| -rw-r--r-- | src/network/networkd.h | 1 |
3 files changed, 0 insertions, 11 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index b30fd7ae89..f039a2d687 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1481,9 +1481,6 @@ static int link_set_ipv4_forward(Link *link) { const char *p = NULL; int r; - if (link->network->ip_forward == ADDRESS_FAMILY_KERNEL) - return 0; - p = strjoina("/proc/sys/net/ipv4/conf/", link->ifname, "/forwarding"); r = write_string_file_no_create(p, one_zero(link_ipv4_forward_enabled(link))); if (r < 0) @@ -1500,9 +1497,6 @@ static int link_set_ipv6_forward(Link *link) { if (!socket_ipv6_is_supported()) return 0; - if (link->network->ip_forward == ADDRESS_FAMILY_KERNEL) - return 0; - p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/forwarding"); r = write_string_file_no_create(p, one_zero(link_ipv6_forward_enabled(link))); if (r < 0) diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 2cc53df4b1..db737ad484 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -853,8 +853,6 @@ const char *address_family_boolean_to_string(AddressFamilyBoolean b) { return "ipv4"; if (b == ADDRESS_FAMILY_IPV6) return "ipv6"; - if (b == ADDRESS_FAMILY_KERNEL) - return "kernel"; return NULL; } @@ -874,8 +872,6 @@ AddressFamilyBoolean address_family_boolean_from_string(const char *s) { return ADDRESS_FAMILY_IPV4; if (streq(s, "ipv6")) return ADDRESS_FAMILY_IPV6; - if (streq(s, "kernel")) - return ADDRESS_FAMILY_KERNEL; return _ADDRESS_FAMILY_BOOLEAN_INVALID; } diff --git a/src/network/networkd.h b/src/network/networkd.h index 49afeffe81..4b13d4aed1 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -60,7 +60,6 @@ typedef enum AddressFamilyBoolean { ADDRESS_FAMILY_IPV4 = 1, ADDRESS_FAMILY_IPV6 = 2, ADDRESS_FAMILY_YES = 3, - ADDRESS_FAMILY_KERNEL = 4, _ADDRESS_FAMILY_BOOLEAN_MAX, _ADDRESS_FAMILY_BOOLEAN_INVALID = -1, } AddressFamilyBoolean; |