diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-10 21:21:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-10 21:21:25 +0200 |
| commit | bc68552faad0e134eb22281343d5ae5a4873fa80 (patch) | |
| tree | 2dc4d4339e6012049be4c1c548d226d78fc1090a | |
| parent | Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jg... (diff) | |
| parent | [DECNET]: Use sk_stream_error function rather than DECnet's own (diff) | |
| download | linux-bc68552faad0e134eb22281343d5ae5a4873fa80.tar.xz linux-bc68552faad0e134eb22281343d5ae5a4873fa80.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
| -rw-r--r-- | net/decnet/af_decnet.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 96a02800cd28..acdd18e6adb2 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; } |