Merge branch 'master' of /home/wd/git/u-boot/custodians

2010-06-22 21:30:05 +02:00 · 2010-06-22 21:30:05 +02:00 · 96b35730a4
commit 96b35730a4
parent 9c00b2f0a3 6de27bdc78
1 changed files with 2 additions and 1 deletions
--- a/net/net.c
+++ b/net/net.c
@ -1201,7 +1201,8 @@ static IP_t *__NetDefragment(IP_t *ip, int *lenp)
 		h = payload + h->next_hole;
 	}

-	if (offset8 + (len / 8) <= h - payload) {
+	/* last fragment may be 1..7 bytes, the "+7" forces acceptance */
+	if (offset8 + ((len + 7) / 8) <= h - payload) {
 		/* no overlap with holes (dup fragment?) */
 		return NULL;
 	}