diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2008-08-16 06:39:18 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2008-08-16 06:39:18 +0000 |
| commit | 48d48eb980f98e4631d96fd8f28f987d15f32496 (patch) | |
| tree | c09d29407c6c33b6d73598387cc27ff869841e33 /sys/netinet/udp_usrreq.c | |
| parent | 8382474434d3f8f4abe8305a52283a23a70d1560 (diff) | |
| download | src-48d48eb980f98e4631d96fd8f28f987d15f32496.tar.gz src-48d48eb980f98e4631d96fd8f28f987d15f32496.zip | |
Fix a regression introduced in r179289 splitting up ip6_savecontrol()
into v4-only vs. v6-only inp_flags processing.
When ip6_savecontrol_v4() is called from ip6_savecontrol() we
were not passing back the **mp thus the information will be missing
in userland.
Istead of going with a *** as suggested in the PR we are returning
**mp now and passing in the v4only flag as a pointer argument.
PR: kern/126349
Reviewed by: rwatson, dwmalone
Notes
Notes:
svn path=/head/; revision=181782
Diffstat (limited to 'sys/netinet/udp_usrreq.c')
| -rw-r--r-- | sys/netinet/udp_usrreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 715599e8b6a1..c9cf5d42c5b0 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -216,7 +216,7 @@ udp_append(struct inpcb *inp, struct ip *ip, struct mbuf *n, int off, inp->inp_socket->so_options & (SO_TIMESTAMP | SO_BINTIME)) { #ifdef INET6 if (inp->inp_vflag & INP_IPV6) - ip6_savecontrol_v4(inp, n, &opts); + (void)ip6_savecontrol_v4(inp, n, &opts, NULL); else #endif ip_savecontrol(inp, &opts, ip, n); |