diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-03-15 23:02:08 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-03-15 23:02:08 +0100 |
| commit | dd288e7d75b9041f79fecae77d61cfa345da7266 (patch) | |
| tree | 85ff1d1ea0fe1d6eae0b6819422d5c6c05f862cd /net/ipv6/ip6_output.c | |
| parent | [PATCH] drivers/net/e1000/: proper prototypes (diff) | |
| parent | [PATCH] ieee80211: Fix QoS is not active problem (diff) | |
| download | linux-dd288e7d75b9041f79fecae77d61cfa345da7266.tar.xz linux-dd288e7d75b9041f79fecae77d61cfa345da7266.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index f999edd846a9..5bf70b1442ea 100644 --- a/net/ipv6/ip6_output.c +++ b/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; } |