summaryrefslogtreecommitdiff
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-01-21 18:18:11 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-01-21 18:18:11 +0000
commit2bcccf73c0dd992b24a3594c62edfdf13103de1c (patch)
tree9489f4d22d41612aa344a42350b4ed30c2f6736a /c
parente02d489afc11ee2f7d8be54743086f64a5e0f936 (diff)
2009-01-21 Frank Ueberschar <frank.ueberschar@dsa-volgmann.de>
PR 1354/bsps * network/network.c: In some cases it can occur that an empty mbuf is put on the descriptor chain. (We found it especially then when transmitting fragmented IP Packets.) Since the actual buffer descriptor pointer will be incremented after every inserted mbuf (txBd = sc->txBdBase + sc->txBdHead;) even if m->m_len of the current mbuf was zero. This leads to the bug.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/m68k/av5282/ChangeLog10
-rw-r--r--c/src/lib/libbsp/m68k/av5282/network/network.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog
index 560ced24df..7c1e350b75 100644
--- a/c/src/lib/libbsp/m68k/av5282/ChangeLog
+++ b/c/src/lib/libbsp/m68k/av5282/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-21 Frank Ueberschar <frank.ueberschar@dsa-volgmann.de>
+
+ PR 1354/bsps
+ * network/network.c: In some cases it can occur that an empty mbuf is
+ put on the descriptor chain. (We found it especially then when
+ transmitting fragmented IP Packets.) Since the actual buffer
+ descriptor pointer will be incremented after every inserted mbuf
+ (txBd = sc->txBdBase + sc->txBdHead;) even if m->m_len of the current
+ mbuf was zero. This leads to the bug.
+
2008-03-03 Joel Sherrill <joel.sherrill@OARcorp.com>
* startup/linkcmds, startup/linkcmdsflash, startup/linkcmdsram: Add
diff --git a/c/src/lib/libbsp/m68k/av5282/network/network.c b/c/src/lib/libbsp/m68k/av5282/network/network.c
index 7575072425..2dcf1d1e04 100644
--- a/c/src/lib/libbsp/m68k/av5282/network/network.c
+++ b/c/src/lib/libbsp/m68k/av5282/network/network.c
@@ -548,10 +548,10 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m)
* The IP fragmentation routine in ip_output
* can produce fragments with zero length.
*/
- txBd = sc->txBdBase + sc->txBdHead;
if (m->m_len){
char *p = mtod(m, char *);
int offset = (int) p & 0x3;
+ txBd = sc->txBdBase + sc->txBdHead;
if (offset == 0) {
txBd->buffer = p;
txBd->length = m->m_len;