From 3e9956b70519a67d072ca4ae41a220fb38118d82 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Thu, 18 Aug 2005 14:05:44 -0700 Subject: [PATCH] --- yaml --- r: 5881 b: refs/heads/master c: cb94c62c252796f42bb83fe40960d12f3ea5a82a h: refs/heads/master i: 5879: 70a1118a39596df4da39e4545d6ca6285d3c990a v: v3 --- [refs] | 2 +- trunk/net/ipv4/icmp.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 12167c6e808c..fa18d756c4c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22783649568a28839c5a362f47da7819ecfcbb9f +refs/heads/master: cb94c62c252796f42bb83fe40960d12f3ea5a82a diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c index 3d78464f64ea..badfc5849973 100644 --- a/trunk/net/ipv4/icmp.c +++ b/trunk/net/ipv4/icmp.c @@ -349,12 +349,12 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param, { struct sk_buff *skb; - ip_append_data(icmp_socket->sk, icmp_glue_bits, icmp_param, - icmp_param->data_len+icmp_param->head_len, - icmp_param->head_len, - ipc, rt, MSG_DONTWAIT); - - if ((skb = skb_peek(&icmp_socket->sk->sk_write_queue)) != NULL) { + if (ip_append_data(icmp_socket->sk, icmp_glue_bits, icmp_param, + icmp_param->data_len+icmp_param->head_len, + icmp_param->head_len, + ipc, rt, MSG_DONTWAIT) < 0) + ip_flush_pending_frames(icmp_socket->sk); + else if ((skb = skb_peek(&icmp_socket->sk->sk_write_queue)) != NULL) { struct icmphdr *icmph = skb->h.icmph; unsigned int csum = 0; struct sk_buff *skb1;