瀏覽代碼

[TIPC]: recvmsg() now returns TIPC ancillary data using correct level (SOL_TIPC)

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Allan Stephens 19 年之前
父節點
當前提交
4b087b28a6
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      net/tipc/socket.c

+ 3 - 3
net/tipc/socket.c

@@ -744,10 +744,10 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg,
 	if (unlikely(err)) {
 	if (unlikely(err)) {
 		anc_data[0] = err;
 		anc_data[0] = err;
 		anc_data[1] = msg_data_sz(msg);
 		anc_data[1] = msg_data_sz(msg);
-		if ((res = put_cmsg(m, SOL_SOCKET, TIPC_ERRINFO, 8, anc_data)))
+		if ((res = put_cmsg(m, SOL_TIPC, TIPC_ERRINFO, 8, anc_data)))
 			return res;
 			return res;
 		if (anc_data[1] &&
 		if (anc_data[1] &&
-		    (res = put_cmsg(m, SOL_SOCKET, TIPC_RETDATA, anc_data[1], 
+		    (res = put_cmsg(m, SOL_TIPC, TIPC_RETDATA, anc_data[1], 
 				    msg_data(msg))))
 				    msg_data(msg))))
 			return res;
 			return res;
 	}
 	}
@@ -778,7 +778,7 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg,
 		has_name = 0;
 		has_name = 0;
 	}
 	}
 	if (has_name &&
 	if (has_name &&
-	    (res = put_cmsg(m, SOL_SOCKET, TIPC_DESTNAME, 12, anc_data)))
+	    (res = put_cmsg(m, SOL_TIPC, TIPC_DESTNAME, 12, anc_data)))
 		return res;
 		return res;
 
 
 	return 0;
 	return 0;