summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorMichele Marchetto <michele@cvs.openbsd.org>2008-10-28 01:16:15 +0000
committerMichele Marchetto <michele@cvs.openbsd.org>2008-10-28 01:16:15 +0000
commit5e350d03b8a10e78f1a115088a3b825131915a91 (patch)
treea8cfcd26c900d131e8afa73296b39004de932c2c /sys/net
parent095944c236117520542b7e28345123139b629d8e (diff)
Added mpls_output() used to output mpls packets originating from local host.
Strictly similar to mpls_input(). Input and OK claudio@, OK laurent@
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_mpe.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c
index 518220355d2..20f21292570 100644
--- a/sys/net/if_mpe.c
+++ b/sys/net/if_mpe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mpe.c,v 1.11 2008/10/18 12:30:40 michele Exp $ */
+/* $OpenBSD: if_mpe.c,v 1.12 2008/10/28 01:16:14 michele Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -165,7 +165,7 @@ mpestart(struct ifnet *ifp)
continue;
}
m->m_pkthdr.rcvif = ifp;
- mpls_input(m);
+ mpls_output(m);
}
}
@@ -289,9 +289,6 @@ mpe_input(struct mbuf *m, struct ifnet *ifp, struct sockaddr_mpls *smpls,
bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT);
#endif
s = splnet();
- /*
- * assume we only get fed ipv4 packets for now.
- */
IF_ENQUEUE(&ipintrq, m);
schednetisr(NETISR_IP);
splx(s);
@@ -311,9 +308,6 @@ mpe_input6(struct mbuf *m, struct ifnet *ifp, struct sockaddr_mpls *smpls,
bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT);
#endif
s = splnet();
- /*
- * assume we only get fed ipv4 packets for now.
- */
IF_ENQUEUE(&ip6intrq, m);
schednetisr(NETISR_IPV6);
splx(s);