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

uspace/lib/nic/src/nic_impl.c

@@ -87 +87 @@
         }
         if (state == NIC_STATE_ACTIVE) {
-                if (nic_data->client_session == NULL || nic_data->device_id < 0) {
+                if (nic_data->client_session == NULL) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);
                         return EINVAL;
@@ -118 +118 @@
                 /* Notify upper layers that we are reseting the MAC */
                 int rc = nic_ev_addr_changed(nic_data->client_session,
-                        nic_data->device_id, &nic_data->default_mac);
+                        &nic_data->default_mac);
                 nic_data->poll_mode = nic_data->default_poll_mode;
                 memcpy(&nic_data->poll_period, &nic_data->default_poll_period,
@@ -150 +150 @@
         nic_data->state = state;
 
-        nic_ev_device_state(nic_data->client_session, nic_data->device_id, state);
+        nic_ev_device_state(nic_data->client_session, state);
 
         fibril_rwlock_write_unlock(&nic_data->main_lock);
@@ -187 +187 @@
  *
  * @param       fun
- * @param       device_id       ID of the device as used in higher layers
  *
  * @return EOK          On success, or negative error code.
  */
-int nic_callback_create_impl(ddf_fun_t *fun, nic_device_id_t device_id)
+int nic_callback_create_impl(ddf_fun_t *fun)
 {
         nic_t *nic = (nic_t *) fun->driver_data;
         fibril_rwlock_write_lock(&nic->main_lock);
-        
-        nic->device_id = device_id;
         
         nic->client_session = async_callback_receive(EXCHANGE_SERIALIZE);