summaryrefslogtreecommitdiffstats
path: root/sys/net/if_arcsubr.c
diff options
context:
space:
mode:
authorgnn <gnn@FreeBSD.org>2016-02-04 22:53:12 +0000
committergnn <gnn@FreeBSD.org>2016-02-04 22:53:12 +0000
commitcd6535554e503550ca26a3ad8290147c8655013d (patch)
tree003068d5195e948340db1290faf264aafe30ed88 /sys/net/if_arcsubr.c
parent5c35f05097207e5b70f18aa41aa368f51f037303 (diff)
downloadFreeBSD-src-cd6535554e503550ca26a3ad8290147c8655013d.zip
FreeBSD-src-cd6535554e503550ca26a3ad8290147c8655013d.tar.gz
MFC: r290383,295282,295283
Replace the fastforward path with tryforward which does not require a sysctl and will always be on. The former split between default and fast forwarding is removed by this commit while preserving the ability to use all network stack features. Differential Revision: https://reviews.freebsd.org/D4042 Reviewed by: ae, melifaro, olivier, rwatson Approved by: re (glebius) Sponsored by: Rubicon Communications (Netgate)
Diffstat (limited to 'sys/net/if_arcsubr.c')
-rw-r--r--sys/net/if_arcsubr.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index 2f94785..1091ae4 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -557,15 +557,11 @@ arc_input(struct ifnet *ifp, struct mbuf *m)
#ifdef INET
case ARCTYPE_IP:
m_adj(m, ARC_HDRNEWLEN);
- if ((m = ip_fastforward(m)) == NULL)
- return;
isr = NETISR_IP;
break;
case ARCTYPE_IP_OLD:
m_adj(m, ARC_HDRLEN);
- if ((m = ip_fastforward(m)) == NULL)
- return;
isr = NETISR_IP;
break;
OpenPOWER on IntegriCloud