Author: delphij
Date: Tue Dec 15 01:14:33 2009
New Revision: 200562
URL: http://svn.freebsd.org/changeset/base/200562
Log:
MFC r200287:
Allow using IPv6 in nfsrvd_sentcache() callback.
PR: kern/141289
Submitted by: Petr Lampa <lampa fit vutbr cz>
Modified:
stable/8/sys/fs/nfsserver/nfs_nfsdcache.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/fs/nfsserver/nfs_nfsdcache.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdcache.c Tue Dec 15 00:44:33 2009
(r200561)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdcache.c Tue Dec 15 01:14:33 2009
(r200562)
@@ -522,8 +522,9 @@ nfsrvd_sentcache(struct nfsrvcache *rp,
if (!(rp->rc_flag & RC_LOCKED))
panic("nfsrvd_sentcache not locked");
if (!err) {
- if (so->so_proto->pr_domain->dom_family != AF_INET ||
- so->so_proto->pr_protocol != IPPROTO_TCP)
+ if ((so->so_proto->pr_domain->dom_family != AF_INET &&
+ so->so_proto->pr_domain->dom_family != AF_INET6) ||
+ so->so_proto->pr_protocol != IPPROTO_TCP)
panic("nfs sent cache");
if (nfsrv_getsockseqnum(so, &rp->rc_tcpseq))
rp->rc_flag |= RC_TCPSEQ;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
