Changeset 1bc35b5 in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2012-01-19T08:13:45Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8da56b

Parents:

3ea725e

Message:

Remove most use of packet_t from NIC drivers.

File:

• uspace/lib/nic/src/nic_driver.c (modified) (9 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -290 +290 @@
  *
  *  @param nic_data     The NIC driver data
- *  @param packet_size  Size of packet
- *  @param offload_size Size of packet offload
+ *  @param size         Frame size in bytes
  *  @return pointer to allocated frame if success, NULL otherwise
  */
-nic_frame_t *nic_alloc_frame(nic_t *nic_data, size_t packet_size)
+nic_frame_t *nic_alloc_frame(nic_t *nic_data, size_t size)
 {
         nic_frame_t *frame;
@@ -313 +312 @@
         }
 
-        packet_t *packet = nic_alloc_packet(nic_data, packet_size);
-        if (!packet) {
+        frame->data = malloc(size);
+        if (frame->data == NULL) {
                 free(frame);
                 return NULL;
         }
 
-        frame->packet = packet;
+        frame->size = size;
         return frame;
 }
@@ -332 +331 @@
         if (!frame)
                 return;
-        if (frame->packet != NULL) {
-                nic_release_packet(nic_data, frame->packet);
-        }
+
+        if (frame->data != NULL) {
+                free(frame->data);
+                frame->data = NULL;
+                frame->size = 0;
+        }
+
         fibril_mutex_lock(&nic_globals.lock);
         if (nic_globals.frame_cache_size >= NIC_GLOBALS_MAX_CACHE_SIZE) {
@@ -622 +625 @@
 
 /**
- * Provided for correct naming conventions.
- * The packet is checked by filters and then sent up to the NIL layer or
- * discarded, the frame is released.
- *
- * @param nic_data
- * @param frame         The frame containing received packet
+ * This is the function that the driver should call when it receives a frame.
+ * The frame is checked by filters and then sent up to the NIL layer or
+ * discarded. The frame is released.
+ *
+ * @param nic_data
+ * @param frame         The received frame
  */
 void nic_received_frame(nic_t *nic_data, nic_frame_t *frame)
-{
-        nic_received_packet(nic_data, frame->packet);
-        frame->packet = NULL;
-        nic_release_frame(nic_data, frame);
-}
-
-/**
- * This is the function that the driver should call when it receives a packet.
- * The packet is checked by filters and then sent up to the NIL layer or
- * discarded.
- *
- * @param nic_data
- * @param packet                The received packet
- */
-void nic_received_packet(nic_t *nic_data, packet_t *packet)
 {
         /* Note: this function must not lock main lock, because loopback driver
          *               calls it inside write_packet handler (with locked main lock) */
-        packet_id_t pid = packet_get_id(packet);
-        
         fibril_rwlock_read_lock(&nic_data->rxc_lock);
         nic_frame_type_t frame_type;
-        int check = nic_rxc_check(&nic_data->rx_control, packet, &frame_type);
+        int check = nic_rxc_check(&nic_data->rx_control, frame->data,
+            frame->size, &frame_type);
         fibril_rwlock_read_unlock(&nic_data->rxc_lock);
         /* Update statistics */
@@ -659 +646 @@
         if (nic_data->state == NIC_STATE_ACTIVE && check) {
                 nic_data->stats.receive_packets++;
-                nic_data->stats.receive_bytes += packet_get_data_length(packet);
+                nic_data->stats.receive_bytes += frame->size;
                 switch (frame_type) {
                 case NIC_FRAME_MULTICAST:
@@ -671 +658 @@
                 }
                 fibril_rwlock_write_unlock(&nic_data->stats_lock);
-                nil_received_msg(nic_data->nil_session, nic_data->device_id, pid);
+                nil_received_msg(nic_data->nil_session, nic_data->device_id,
+                    frame->data, frame->size);
         } else {
                 switch (frame_type) {
@@ -685 +673 @@
                 }
                 fibril_rwlock_write_unlock(&nic_data->stats_lock);
-                nic_release_packet(nic_data, packet);
-        }
+        }
+        nic_release_frame(nic_data, frame);
 }
 
@@ -705 +693 @@
         
         nil_received_msg(nic_data->nil_session, nic_data->device_id,
-            packet_get_id(packet));
+            packet_get_data(packet), packet_get_data_length(packet));
 }
 
@@ -726 +714 @@
 
                 list_remove(&frame->link);
-                nic_received_packet(nic_data, frame->packet);
-                frame->packet = NULL;
-                nic_release_frame(nic_data, frame);
+                nic_received_frame(nic_data, frame);
         }
         nic_driver_release_frame_list(frames);