diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
commit | 2acab771b7e676125cb8c96b61dcdefe9ba67e57 (patch) | |
tree | 86227af3c9ad0d90823e5488a86f7f453ed1837a /net/ipv4/ip_output.c | |
parent | 201e06279823c73242de987f192f43d2b30e5331 (diff) | |
parent | 64541d19702cfdb7ea946fdc20faee849f6874b1 (diff) |
Merge branch 'master'
Diffstat (limited to 'net/ipv4/ip_output.c')
-rw-r--r-- | net/ipv4/ip_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 8dcba3887f04..cff9c3a72daf 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c | |||
@@ -904,7 +904,7 @@ alloc_new_skb: | |||
904 | * because we have no idea what fragment will be | 904 | * because we have no idea what fragment will be |
905 | * the last. | 905 | * the last. |
906 | */ | 906 | */ |
907 | if (datalen == length) | 907 | if (datalen == length + fraggap) |
908 | alloclen += rt->u.dst.trailer_len; | 908 | alloclen += rt->u.dst.trailer_len; |
909 | 909 | ||
910 | if (transhdrlen) { | 910 | if (transhdrlen) { |