diff options
author | Wolfgang Denk <wd@denx.de> | 2010-06-22 21:30:05 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-06-22 21:30:05 +0200 |
commit | 96b35730a43160afa025ac405961737dbb0682b4 (patch) | |
tree | ab8177e5b070d928a408b67546e6f1c714fb5d2e | |
parent | 9c00b2f0a3fe0f779761607024f99b7690c9776c (diff) | |
parent | 6de27bdc788e7c4532ee0721ae291aeb5df475dc (diff) | |
download | bootable_bootloader_goldelico_gta04-96b35730a43160afa025ac405961737dbb0682b4.zip bootable_bootloader_goldelico_gta04-96b35730a43160afa025ac405961737dbb0682b4.tar.gz bootable_bootloader_goldelico_gta04-96b35730a43160afa025ac405961737dbb0682b4.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/custodians
-rw-r--r-- | net/net.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; } |