Changeset 70922c2 in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2012-02-01T00:09:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ffcc5776

Parents:

cb3dbb63 (diff), 3d4750f (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:

Mainline changes.

File:

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

uspace/drv/nic/e1k/e1k.c

@@ -1402 +1402 @@
         fibril_mutex_unlock(&e1000->rx_lock);
         return EOK;
+        
 error:
         for (i = 0; i < E1000_RX_FRAME_COUNT; i++) {
@@ -1410 +1411 @@
                 }
         }
+        
         if (e1000->rx_frame_phys != NULL) {
                 free(e1000->rx_frame_phys);
                 e1000->rx_frame_phys = NULL;
         }
+        
         if (e1000->rx_frame_virt != NULL) {
                 free(e1000->rx_frame_virt);
                 e1000->rx_frame_phys = NULL;
         }
+        
         return rc;
 }
@@ -1642 +1646 @@
                 e1000->tx_frame_phys = NULL;
         }
+        
         dmamem_unmap_anonymous(e1000->tx_ring_virt);
 }
@@ -2052 +2057 @@
         case E1000_82545:
         case E1000_82546:
-        case E1000_82572:
                 e1000->info.eerd_start = 0x01;
                 e1000->info.eerd_done = 0x10;
@@ -2059 +2063 @@
                 break;
         case E1000_82547:
+        case E1000_82572:
         case E1000_80003ES2:
                 e1000->info.eerd_start = 0x01;