aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Whitehouse <steve@chygwyn.com>2005-08-10 11:32:57 -0700
committerDavid S. Miller <davem@davemloft.net>2005-08-10 11:32:57 -0700
commit001ab02a8c04f0b4dc773c474da698ad7405ae68 (patch)
tree760d373edc5603ff3e3b05d274236e35bffdebdd
parent86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff)
downloadkernel_samsung_crespo-001ab02a8c04f0b4dc773c474da698ad7405ae68.zip
kernel_samsung_crespo-001ab02a8c04f0b4dc773c474da698ad7405ae68.tar.gz
kernel_samsung_crespo-001ab02a8c04f0b4dc773c474da698ad7405ae68.tar.bz2
[DECNET]: Use sk_stream_error function rather than DECnet's own
Signed-off-by: Steven Whitehouse <steve@chygwyn.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/decnet/af_decnet.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 96a0280..acdd18e 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -1876,15 +1876,6 @@ static inline unsigned int dn_current_mss(struct sock *sk, int flags)
return mss_now;
}
-static int dn_error(struct sock *sk, int flags, int err)
-{
- if (err == -EPIPE)
- err = sock_error(sk) ? : -EPIPE;
- if (err == -EPIPE && !(flags & MSG_NOSIGNAL))
- send_sig(SIGPIPE, current, 0);
- return err;
-}
-
static int dn_sendmsg(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t size)
{
@@ -2045,7 +2036,7 @@ out:
return sent ? sent : err;
out_err:
- err = dn_error(sk, flags, err);
+ err = sk_stream_error(sk, flags, err);
release_sock(sk);
return err;
}