From 76210041f6e9a0301d5aaff647009c8ced3020f0 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Mon, 16 Oct 2006 21:43:54 -0700
Subject: [PATCH] --- yaml --- r: 40026 b: refs/heads/master c:
 eb5959c2bd290bf6c24ddf6d1f5ebcb496c54adb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9618d9bba15c..01d5960526f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29ede244cc4cfb11432a0bffd158ba09e7b2c167
+refs/heads/master: eb5959c2bd290bf6c24ddf6d1f5ebcb496c54adb
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
index acfb852e7c98..ed900fe96bdf 100644
--- a/trunk/net/tipc/socket.c
+++ b/trunk/net/tipc/socket.c
@@ -2,7 +2,7 @@
  * net/tipc/socket.c: TIPC socket API
  * 
  * Copyright (c) 2001-2006, Ericsson AB
- * Copyright (c) 2004-2005, Wind River Systems
+ * Copyright (c) 2004-2006, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -629,6 +629,9 @@ static int send_stream(struct kiocb *iocb, struct socket *sock,
                         return -ENOTCONN;
         }
 
+	if (unlikely(m->msg_name))
+		return -EISCONN;
+
 	/* 
 	 * Send each iovec entry using one or more messages
 	 *
@@ -641,6 +644,8 @@ static int send_stream(struct kiocb *iocb, struct socket *sock,
 	curr_iovlen = m->msg_iovlen;
 	my_msg.msg_iov = &my_iov;
 	my_msg.msg_iovlen = 1;
+	my_msg.msg_flags = m->msg_flags;
+	my_msg.msg_name = NULL;
 	bytes_sent = 0;
 
 	while (curr_iovlen--) {