aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/socket.c
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2006-06-26 02:47:44 -0400
committerDavid S. Miller <davem@davemloft.net>2006-06-26 02:47:44 -0400
commit4b087b28a629cc9388e42fdccdcd929deaa7ac81 (patch)
treec0cfa32be5bd91352986b8bd8cb1625c01547a34 /net/tipc/socket.c
parent499786516fc12791223f075d682a45ea1129eb04 (diff)
[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>
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r--net/tipc/socket.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index a1f22100a61..abecf2d422f 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -744,10 +744,10 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg,
744 if (unlikely(err)) { 744 if (unlikely(err)) {
745 anc_data[0] = err; 745 anc_data[0] = err;
746 anc_data[1] = msg_data_sz(msg); 746 anc_data[1] = msg_data_sz(msg);
747 if ((res = put_cmsg(m, SOL_SOCKET, TIPC_ERRINFO, 8, anc_data))) 747 if ((res = put_cmsg(m, SOL_TIPC, TIPC_ERRINFO, 8, anc_data)))
748 return res; 748 return res;
749 if (anc_data[1] && 749 if (anc_data[1] &&
750 (res = put_cmsg(m, SOL_SOCKET, TIPC_RETDATA, anc_data[1], 750 (res = put_cmsg(m, SOL_TIPC, TIPC_RETDATA, anc_data[1],
751 msg_data(msg)))) 751 msg_data(msg))))
752 return res; 752 return res;
753 } 753 }
@@ -778,7 +778,7 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg,
778 has_name = 0; 778 has_name = 0;
779 } 779 }
780 if (has_name && 780 if (has_name &&
781 (res = put_cmsg(m, SOL_SOCKET, TIPC_DESTNAME, 12, anc_data))) 781 (res = put_cmsg(m, SOL_TIPC, TIPC_DESTNAME, 12, anc_data)))
782 return res; 782 return res;
783 783
784 return 0; 784 return 0;