From c273f113b220a315956e99c00873cccb8a592efe Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Sun, 25 Jun 2006 23:47:44 -0700
Subject: [PATCH] --- yaml --- r: 30409 b: refs/heads/master c:
 4b087b28a629cc9388e42fdccdcd929deaa7ac81 h: refs/heads/master i:   30407:
 689db4450a7217a19503422761feddbba4476e30 v: v3

---
 [refs]                  | 2 +-
 trunk/net/tipc/socket.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d31d4a5fb95e..dfc8e7f29887 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 499786516fc12791223f075d682a45ea1129eb04
+refs/heads/master: 4b087b28a629cc9388e42fdccdcd929deaa7ac81
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
index a1f22100a616..abecf2d422ff 100644
--- a/trunk/net/tipc/socket.c
+++ b/trunk/net/tipc/socket.c
@@ -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;
 	}
@@ -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;