diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-01-21 09:45:46 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-01-21 10:00:40 +0100 |
| commit | aec8db05b216a102e334d131b7a71f1514b04679 (patch) | |
| tree | f9343da918ce3585a1ce469d53d4d54d79ca8cc6 /freebsd/sys/kern/kern_mbuf.c | |
| parent | dpaa: Use if_transmit instead of legacy if_start (diff) | |
| download | rtems-libbsd-aec8db05b216a102e334d131b7a71f1514b04679.tar.bz2 | |
Update to FreeBSD stable/12 2019-01-16
Git mirror commit 4ff7d8141f665693dd8b17090d410604888f1e9a.
Update #3472.
Diffstat (limited to 'freebsd/sys/kern/kern_mbuf.c')
| -rw-r--r-- | freebsd/sys/kern/kern_mbuf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/freebsd/sys/kern/kern_mbuf.c b/freebsd/sys/kern/kern_mbuf.c index f94eda5b..e0f359d9 100644 --- a/freebsd/sys/kern/kern_mbuf.c +++ b/freebsd/sys/kern/kern_mbuf.c @@ -35,9 +35,9 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_param.h> #include <sys/param.h> -#include <sys/conf.h> #include <sys/domainset.h> #include <sys/malloc.h> +#include <sys/types.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/domain.h> @@ -433,8 +433,6 @@ nd_buf_import(void *arg, void **store, int count, int domain __unused, trash_init(m, q == &nd_mbufq ? MSIZE : nd_clsize, flags); store[i] = m; } - KASSERT((flags & M_WAITOK) == 0 || i == count, - ("%s: ran out of pre-allocated mbufs", __func__)); return (i); } @@ -473,8 +471,6 @@ nd_pack_import(void *arg __unused, void **store, int count, int domain __unused, mb_ctor_clust(clust, nd_clsize, m, 0); store[i] = m; } - KASSERT((flags & M_WAITOK) == 0 || i == count, - ("%s: ran out of pre-allocated mbufs", __func__)); return (i); } |