Changeset 28711

Timestamp:

11/21/08 15:10:36 (7 weeks ago)

Author:

oruizdorantes

Message:

size does not need to be calculated. Merge configuration parameters only if specified.

Files:

• haiku/trunk/src/add-ons/kernel/network/protocols/l2cap/l2cap_command.cpp (modified) (5 diffs)

haiku/trunk/src/add-ons/kernel/network/protocols/l2cap/l2cap_command.cpp

@@ -131 +131 @@
         }
 
-        _m->size = sizeof(bufferHeader->hdr) + bufferHeader->hdr.length;         /* TODO: needed ?*/
-
         bufferHeader->hdr.length = htole16(bufferHeader->hdr.length);
 
@@ -212 +210 @@
         }
 
-        (_m)->size = sizeof(struct _cfg_req);     /* check if needed */
-
         NetBufferPrepend<struct _cfg_req> bufferHeader(_m);
         status_t status = bufferHeader.Status();
@@ -232 +228 @@
         /* Add the given data */
         // TODO: given data can be freed... merge does it?
-        gBufferModule->merge(_m, _data, true);
+        if (_data != NULL)
+                gBufferModule->merge(_m, _data, true);
 
         return _m;
@@ -265 +262 @@
 
         bufferHeader.Sync();
-
-        gBufferModule->merge(_m, _data, true);
+        
+        if (_data != NULL)
+                gBufferModule->merge(_m, _data, true);
 
         return _m;
@@ -414 +412 @@
                 }
         }
-
-        (_m)->size = sizeof(bufferHeader->hdr) + bufferHeader->hdr.length;
 
         bufferHeader->hdr.length = htole16(bufferHeader->hdr.length);