git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
net
/
decnet
/
dn_nsp_out.c
diff --git
a/net/decnet/dn_nsp_out.c
b/net/decnet/dn_nsp_out.c
index
0b4ef49
..
42abbf3
100644
(file)
--- a/
net/decnet/dn_nsp_out.c
+++ b/
net/decnet/dn_nsp_out.c
@@
-141,7
+141,7
@@
struct sk_buff *dn_alloc_skb(struct sock *sk, int size, int pri)
* whole size thats been asked for (plus 11 bytes of header). If this
* fails, then we try for any size over 16 bytes for SOCK_STREAMS.
*/
* whole size thats been asked for (plus 11 bytes of header). If this
* fails, then we try for any size over 16 bytes for SOCK_STREAMS.
*/
-struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int noblock, int *err)
+struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int noblock,
long timeo,
int *err)
{
int space;
int len;
{
int space;
int len;
@@
-151,7
+151,7
@@
struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int noblock, in
while(skb == NULL) {
if (signal_pending(current)) {
while(skb == NULL) {
if (signal_pending(current)) {
- *err =
ERESTARTSYS
;
+ *err =
sock_intr_errno(timeo)
;
break;
}
break;
}