Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30409
b: refs/heads/master
c: 4b087b2
h: refs/heads/master
i:
  30407: 689db44
v: v3
  • Loading branch information
Allan Stephens authored and David S. Miller committed Jun 26, 2006
1 parent 006941f commit c273f11
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 499786516fc12791223f075d682a45ea1129eb04
refs/heads/master: 4b087b28a629cc9388e42fdccdcd929deaa7ac81
6 changes: 3 additions & 3 deletions trunk/net/tipc/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -744,10 +744,10 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg,
if (unlikely(err)) {
anc_data[0] = err;
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;
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))))
return res;
}
Expand Down Expand Up @@ -778,7 +778,7 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg,
has_name = 0;
}
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 0;
Expand Down

0 comments on commit c273f11

Please sign in to comment.