Changeset 081971b in mainline for uspace/srv/ethip/pdu.c

Timestamp:

2012-02-13T23:10:29Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

87e5658c

Parents:

2ff150e

Message:

Need to pad short Ethernet frames. Add some more debugging code.

File:

• uspace/srv/ethip/pdu.c (modified) (3 diffs)

uspace/srv/ethip/pdu.c

@@ -38 +38 @@
 #include <errno.h>
 #include <io/log.h>
+#include <macros.h>
 #include <mem.h>
 #include <stdlib.h>
@@ -57 +58 @@
         eth_header_t *hdr;
 
-        size = sizeof(eth_header_t) + frame->size;
+        size = max(sizeof(eth_header_t) + frame->size, ETH_FRAME_MIN_SIZE);
 
         data = calloc(size, 1);
@@ -122 +123 @@
 
         val = addr->addr;
-        for (i = 0; i < MAC48_BYTES; i++) {
+        for (i = 0; i < MAC48_BYTES; i++)
                 bbuf[i] = (val >> (8 * (MAC48_BYTES - i - 1))) & 0xff;
-                val = val >> 8;
-        }
 }