Author: delphij
Date: Tue Dec  8 23:43:50 2009
New Revision: 200287
URL: http://svn.freebsd.org/changeset/base/200287

Log:
  Allow using IPv6 in nfsrvd_sentcache() callback.
  
  PR:           kern/141289
  Submitted by: Petr Lampa <lampa fit vutbr cz>
  Approved by:  rmacklem
  MFC after:    1 week

Modified:
  head/sys/fs/nfsserver/nfs_nfsdcache.c

Modified: head/sys/fs/nfsserver/nfs_nfsdcache.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdcache.c       Tue Dec  8 23:34:34 2009        
(r200286)
+++ head/sys/fs/nfsserver/nfs_nfsdcache.c       Tue Dec  8 23:43:50 2009        
(r200287)
@@ -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"

Reply via email to