From a90b57e941ca79fb03889197f7fb2ff7ac1317fc Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sun, 12 Mar 2006 20:35:12 -0800 Subject: [PATCH] --- yaml --- r: 21021 b: refs/heads/master c: baa829d8926f02ab04be6ec37780810d221c5b4b h: refs/heads/master i: 21019: c4021e59b5cd23a83fb0e756134ded8481f09ecf v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_output.c | 7 ++++--- trunk/net/ipv6/ip6_output.c | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6a2793d095c6..7a2a33361e86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a1ff6e2bde56cdf176bd54d557b2e15e819f810 +refs/heads/master: baa829d8926f02ab04be6ec37780810d221c5b4b diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c index 57d290d89ec2..8ee4d016740d 100644 --- a/trunk/net/ipv4/ip_output.c +++ b/trunk/net/ipv4/ip_output.c @@ -847,10 +847,11 @@ int ip_append_data(struct sock *sk, if (((length > mtu) && (sk->sk_protocol == IPPROTO_UDP)) && (rt->u.dst.dev->features & NETIF_F_UFO)) { - if(ip_ufo_append_data(sk, getfrag, from, length, hh_len, - fragheaderlen, transhdrlen, mtu, flags)) + err = ip_ufo_append_data(sk, getfrag, from, length, hh_len, + fragheaderlen, transhdrlen, mtu, + flags); + if (err) goto error; - return 0; } diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c index f999edd846a9..5bf70b1442ea 100644 --- a/trunk/net/ipv6/ip6_output.c +++ b/trunk/net/ipv6/ip6_output.c @@ -944,10 +944,11 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, if (((length > mtu) && (sk->sk_protocol == IPPROTO_UDP)) && (rt->u.dst.dev->features & NETIF_F_UFO)) { - if(ip6_ufo_append_data(sk, getfrag, from, length, hh_len, - fragheaderlen, transhdrlen, mtu, flags)) + err = ip6_ufo_append_data(sk, getfrag, from, length, hh_len, + fragheaderlen, transhdrlen, mtu, + flags); + if (err) goto error; - return 0; }