Changes in uspace/drv/nic/ne2k/dp8390.c [6d8455d:80099c19] in mainline

File:

• uspace/drv/nic/ne2k/dp8390.c (modified) (5 diffs)

uspace/drv/nic/ne2k/dp8390.c

@@ -142 +142 @@
 static void ne2k_upload(ne2k_t *ne2k, void *buf, size_t addr, size_t size)
 {
-        size_t esize_ru = (size + 1) & ~1;
         size_t esize = size & ~1;
         
-        pio_write_8(ne2k->port + DP_RBCR0, esize_ru & 0xff);
-        pio_write_8(ne2k->port + DP_RBCR1, (esize_ru >> 8) & 0xff);
+        pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff);
+        pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff);
         pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff);
         pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff);
@@ -404 +403 @@
  *
  * @param[in,out] ne2k   Network interface structure.
- * @param[in]     data   Pointer to frame data
- * @param[in]     size   Frame size in bytes
- *
- */
-void ne2k_send(nic_t *nic_data, void *data, size_t size)
+ * @param[in]     packet Frame to be sent.
+ *
+ */
+void ne2k_send(nic_t *nic_data, packet_t *packet)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
@@ -420 +418 @@
                 fibril_condvar_wait(&ne2k->sq_cv, &ne2k->sq_mutex);
         }
+        void *buf = packet_get_data(packet);
+        size_t size = packet_get_data_length(packet);
         
         if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) {
@@ -427 +427 @@
 
         /* Upload the frame to the ethernet card */
-        ne2k_upload(ne2k, data, ne2k->sq.page * DP_PAGE, size);
+        ne2k_upload(ne2k, buf, ne2k->sq.page * DP_PAGE, size);
         ne2k->sq.dirty = true;
         ne2k->sq.size = size;
@@ -437 +437 @@
         pio_write_8(ne2k->port + DP_CR, CR_TXP | CR_STA);
         fibril_mutex_unlock(&ne2k->sq_mutex);
+
+        /* Relase packet */
+        nic_release_packet(nic_data, packet);
 }