summaryrefslogtreecommitdiffstats
path: root/sys/net/bridgestp.c
diff options
context:
space:
mode:
authorthompsa <thompsa@FreeBSD.org>2012-02-23 00:59:21 +0000
committerthompsa <thompsa@FreeBSD.org>2012-02-23 00:59:21 +0000
commit51c7bc89f03c75520ffd7c33fdcbb80a9b81a614 (patch)
treedd210d8dd6e2e20989714f9fbcc00161de501819 /sys/net/bridgestp.c
parentc094a4b8e20b2d1f5fc983dc23becf54066467f1 (diff)
downloadFreeBSD-src-51c7bc89f03c75520ffd7c33fdcbb80a9b81a614.zip
FreeBSD-src-51c7bc89f03c75520ffd7c33fdcbb80a9b81a614.tar.gz
bstp_input() always consumes the packet so remove the mbuf handling dance
around it. Obtained from: OpenBSD (r1.37)
Diffstat (limited to 'sys/net/bridgestp.c')
-rw-r--r--sys/net/bridgestp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index e263b0b..12a7949 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -446,7 +446,7 @@ bstp_pdu_flags(struct bstp_port *bp)
return (flags);
}
-struct mbuf *
+void
bstp_input(struct bstp_port *bp, struct ifnet *ifp, struct mbuf *m)
{
struct bstp_state *bs = bp->bp_bs;
@@ -456,7 +456,7 @@ bstp_input(struct bstp_port *bp, struct ifnet *ifp, struct mbuf *m)
if (bp->bp_active == 0) {
m_freem(m);
- return (NULL);
+ return;
}
BSTP_LOCK(bs);
@@ -521,7 +521,6 @@ out:
BSTP_UNLOCK(bs);
if (m)
m_freem(m);
- return (NULL);
}
static void
OpenPOWER on IntegriCloud