diff options
| author | dim <dim@FreeBSD.org> | 2016-01-11 19:36:44 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-01-11 19:36:44 +0000 |
| commit | 79c349e677e1561f808f42fec3e6151d88397dd8 (patch) | |
| tree | ea943142da24fe9f4d36e8fd2ca89c22a874740d /sys/netgraph | |
| parent | ca5a713355f56c0b7f18b4a361310ac52b13b066 (diff) | |
| parent | 4ba3f354902d216384ffbcd5a6b1b3e219d451ea (diff) | |
| download | FreeBSD-src-79c349e677e1561f808f42fec3e6151d88397dd8.zip FreeBSD-src-79c349e677e1561f808f42fec3e6151d88397dd8.tar.gz | |
Merge ^/head r293430 through r293685.
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c | 4 | ||||
| -rw-r--r-- | sys/netgraph/netflow/netflow.c | 1 | ||||
| -rw-r--r-- | sys/netgraph/netflow/netflow_v9.c | 1 | ||||
| -rw-r--r-- | sys/netgraph/netflow/ng_netflow.c | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c index f0cd01e..68c5975 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c @@ -972,7 +972,7 @@ ng_btsocket_rfcomm_send(struct socket *so, int flags, struct mbuf *m, } /* Put the packet on the socket's send queue and wakeup RFCOMM task */ - sbappend(&pcb->so->so_snd, m); + sbappend(&pcb->so->so_snd, m, flags); m = NULL; if (!(pcb->flags & NG_BTSOCKET_RFCOMM_DLC_SENDING)) { @@ -2396,7 +2396,7 @@ ng_btsocket_rfcomm_receive_uih(ng_btsocket_rfcomm_session_p s, int dlci, error = ENOBUFS; } else { /* Append packet to the socket receive queue */ - sbappend(&pcb->so->so_rcv, m0); + sbappend(&pcb->so->so_rcv, m0, 0); m0 = NULL; sorwakeup(pcb->so); diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c index 644d46f..87ff189 100644 --- a/sys/netgraph/netflow/netflow.c +++ b/sys/netgraph/netflow/netflow.c @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/counter.h> #include <sys/kernel.h> +#include <sys/ktr.h> #include <sys/limits.h> #include <sys/mbuf.h> #include <sys/syslog.h> diff --git a/sys/netgraph/netflow/netflow_v9.c b/sys/netgraph/netflow/netflow_v9.c index fe85f42..2fc700d 100644 --- a/sys/netgraph/netflow/netflow_v9.c +++ b/sys/netgraph/netflow/netflow_v9.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/counter.h> #include <sys/kernel.h> +#include <sys/ktr.h> #include <sys/limits.h> #include <sys/mbuf.h> #include <sys/syslog.h> diff --git a/sys/netgraph/netflow/ng_netflow.c b/sys/netgraph/netflow/ng_netflow.c index b5a82a4..b524ca5 100644 --- a/sys/netgraph/netflow/ng_netflow.c +++ b/sys/netgraph/netflow/ng_netflow.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/counter.h> #include <sys/kernel.h> +#include <sys/ktr.h> #include <sys/limits.h> #include <sys/mbuf.h> #include <sys/socket.h> |
