diff options
| author | bz <bz@FreeBSD.org> | 2008-08-16 06:39:18 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2008-08-16 06:39:18 +0000 |
| commit | eafee510a97921d081800945c98ef8a0575e49fb (patch) | |
| tree | c09d29407c6c33b6d73598387cc27ff869841e33 /sys/netinet6/ip6_var.h | |
| parent | b9ac5192a235cc6efad426f7c989608188af9d9d (diff) | |
| download | FreeBSD-src-eafee510a97921d081800945c98ef8a0575e49fb.zip FreeBSD-src-eafee510a97921d081800945c98ef8a0575e49fb.tar.gz | |
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
Diffstat (limited to 'sys/netinet6/ip6_var.h')
| -rw-r--r-- | sys/netinet6/ip6_var.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index 2370737..f13ea34 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -350,7 +350,8 @@ extern int (*ip6_mforward)(struct ip6_hdr *, struct ifnet *, int ip6_process_hopopts __P((struct mbuf *, u_int8_t *, int, u_int32_t *, u_int32_t *)); -int ip6_savecontrol_v4(struct inpcb *, struct mbuf *, struct mbuf **); +struct mbuf **ip6_savecontrol_v4(struct inpcb *, struct mbuf *, + struct mbuf **, int *); void ip6_savecontrol __P((struct inpcb *, struct mbuf *, struct mbuf **)); void ip6_notify_pmtu __P((struct inpcb *, struct sockaddr_in6 *, u_int32_t *)); |
