X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fdecnet%2Fdn_nsp_out.c;h=42abbf3f524f671b2a94307c216c38ff31f215bc;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=0b4ef494005748d3333e43df97a951807f9e201f;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c index 0b4ef4940..42abbf3f5 100644 --- 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. */ -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; @@ -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)) { - *err = ERESTARTSYS; + *err = sock_intr_errno(timeo); break; }