Changeset 70922c2 in mainline for uspace/lib/nic/src/nic_driver.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/lib/nic/src/nic_driver.c (modified) (4 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -497 +497 @@
         if (nic_data->client_session != NULL) {
                 int rc = nic_ev_addr_changed(nic_data->client_session,
-                    nic_data->device_id, address);
+                    address);
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);
@@ -604 +604 @@
                 }
                 fibril_rwlock_write_unlock(&nic_data->stats_lock);
-                nic_ev_received(nic_data->client_session, nic_data->device_id,
-                    frame->data, frame->size);
+                nic_ev_received(nic_data->client_session, frame->data,
+                    frame->size);
         } else {
                 switch (frame_type) {
@@ -639 +639 @@
         fibril_rwlock_write_unlock(&nic_data->stats_lock);
         
-        nic_ev_received(nic_data->client_session, nic_data->device_id,
-            data, size);
+        nic_ev_received(nic_data->client_session, data, size);
 }
 
@@ -691 +690 @@
         nic_data->dev = NULL;
         nic_data->fun = NULL;
-        nic_data->device_id = NIC_DEVICE_INVALID_ID;
         nic_data->state = NIC_STATE_STOPPED;
         nic_data->client_session = NULL;