svn commit: r254734 - head/sys/ofed/include/linux

Navdeep Parhar np at FreeBSD.org
Fri Aug 23 18:54:28 UTC 2013


Author: np
Date: Fri Aug 23 18:54:27 2013
New Revision: 254734
URL: http://svnweb.freebsd.org/changeset/base/254734

Log:
  Fix implementation of sock_getname.
  
  MFC after:	1 week

Modified:
  head/sys/ofed/include/linux/net.h

Modified: head/sys/ofed/include/linux/net.h
==============================================================================
--- head/sys/ofed/include/linux/net.h	Fri Aug 23 18:52:36 2013	(r254733)
+++ head/sys/ofed/include/linux/net.h	Fri Aug 23 18:54:27 2013	(r254734)
@@ -44,7 +44,7 @@ static inline int
 sock_getname(struct socket *so, struct sockaddr *addr, int *sockaddr_len,
     int peer)
 {
-	struct sockaddr **nam;
+	struct sockaddr *nam;
 	int error;
 
 	nam = NULL;
@@ -52,15 +52,15 @@ sock_getname(struct socket *so, struct s
 		if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0)
 			return (-ENOTCONN);
 
-		error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, nam);
+		error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, &nam);
 	} else
-		error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, nam);
+		error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, &nam);
 	if (error)
 		return (-error);
-	*addr = **nam;
+	*addr = *nam;
 	*sockaddr_len = addr->sa_len;
 
-	free(*nam, M_SONAME);
+	free(nam, M_SONAME);
 	return (0);
 }
 


More information about the svn-src-head mailing list