Changeset cbfece7 in mainline for uspace/srv/net/inetsrv/pdu.c

Timestamp:

2014-07-21T22:10:18Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

1f1fa64

Parents:

96e368a (diff), 54a1ca7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

• Merged mainline changes
• Refactored rtl8169 driver to work with recent driver framework changes
• Fixed speed selection in rtl8169 (disables autonegotiation first)
• Added support for restarting autonegotiation
• Added new switch to 'nic' utility which restarts autonegotiation

File:

• uspace/srv/net/inetsrv/pdu.c (modified) (1 diff)

uspace/srv/net/inetsrv/pdu.c

@@ -106 +106 @@
 {
         /* Upper bound for fragment offset field */
-        size_t fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l);
+        size_t fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l + 1);
         
         /* Verify that total size of datagram is within reasonable bounds */
-        if (offs + packet->size > FRAG_OFFS_UNIT * fragoff_limit)
+        if (packet->size > FRAG_OFFS_UNIT * fragoff_limit)
                 return ELIMIT;