diff options
| author |   claudio <claudio@openbsd.org> | 2019-11-05 08:26:38 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2019-11-05 08:26:38 +0000 |
| commit | e9c99edcabb6862c4e2b4bbf1a5b1b5a19fb41dc (patch) | |
| tree | 7e40e30f6ecdd3d0d14e1aa4a59a92c74bd9b744 /sys/netmpls | |
| parent | Kill uvm_deallocate(9) and use uvm_unmap() directly. (diff) | |
| download | wireguard-openbsd-e9c99edcabb6862c4e2b4bbf1a5b1b5a19fb41dc.tar.xz wireguard-openbsd-e9c99edcabb6862c4e2b4bbf1a5b1b5a19fb41dc.zip | |
Remove mpls_inkloop and the corresponding sysctl net.mpls.maxloop_inkernel.
The value is no longer needed since the MPLS code got refactored some time
ago.
Found by Thomas Habets (thomas (at) habets se)
Diffstat (limited to 'sys/netmpls')
| -rw-r--r-- | sys/netmpls/mpls.h | 8 | ||||
| -rw-r--r-- | sys/netmpls/mpls_raw.c | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/netmpls/mpls.h b/sys/netmpls/mpls.h index 55c53a6d1d9..94b423aa7e4 100644 --- a/sys/netmpls/mpls.h +++ b/sys/netmpls/mpls.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls.h,v 1.42 2019/01/30 01:01:01 dlg Exp $ */ +/* $OpenBSD: mpls.h,v 1.43 2019/11/05 08:26:38 claudio Exp $ */ /* * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. @@ -110,7 +110,6 @@ struct rt_mpls { */ #define MPLSCTL_ENABLE 1 #define MPLSCTL_DEFTTL 2 -#define MPLSCTL_MAXINKLOOP 4 #define MPLSCTL_MAPTTL_IP 5 #define MPLSCTL_MAPTTL_IP6 6 #define MPLSCTL_MAXID 7 @@ -120,7 +119,7 @@ struct rt_mpls { { NULL, 0 }, \ { "ttl", CTLTYPE_INT }, \ { "ifq", CTLTYPE_NODE },\ - { "maxloop_inkernel", CTLTYPE_INT }, \ + { NULL, 0 }, \ { "mapttl_ip", CTLTYPE_INT }, \ { "mapttl_ip6", CTLTYPE_INT } \ } @@ -130,7 +129,7 @@ struct rt_mpls { NULL, \ &mpls_defttl, \ NULL, \ - &mpls_inkloop, \ + NULL, \ &mpls_mapttl_ip, \ &mpls_mapttl_ip6 \ } @@ -161,7 +160,6 @@ extern struct domain mplsdomain; extern int mpls_defttl; extern int mpls_mapttl_ip; extern int mpls_mapttl_ip6; -extern int mpls_inkloop; struct mbuf *mpls_shim_pop(struct mbuf *); diff --git a/sys/netmpls/mpls_raw.c b/sys/netmpls/mpls_raw.c index 6d3a3fab105..c87158a91cb 100644 --- a/sys/netmpls/mpls_raw.c +++ b/sys/netmpls/mpls_raw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_raw.c,v 1.15 2017/02/27 19:16:56 claudio Exp $ */ +/* $OpenBSD: mpls_raw.c,v 1.16 2019/11/05 08:26:38 claudio Exp $ */ /* * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. @@ -46,7 +46,6 @@ #include <netmpls/mpls.h> int mpls_defttl = 255; -int mpls_inkloop = MPLS_INKERNEL_LOOP_MAX; int mpls_push_expnull_ip = 0; int mpls_push_expnull_ip6 = 0; int mpls_mapttl_ip = 1; |