| commit | bb0c78448a9d1f569ab042ec359cab5c51fc1c05 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Tue Jun 22 21:30:05 2010 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Tue Jun 22 21:30:05 2010 +0200 |
| tree | ab8177e5b070d928a408b67546e6f1c714fb5d2e | |
| parent | 34a72dc56bba04861f8205d083341f8c104bdfd1 [diff] | |
| parent | 284902e203862b24fe8b0238d53e4ac637d2968d [diff] |
Merge branch 'master' of /home/wd/git/u-boot/custodians
diff --git a/net/net.c b/net/net.c index cda7319..33fcd90 100644 --- a/net/net.c +++ b/net/net.c
@@ -1201,7 +1201,8 @@ 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; }