Changeset eaa0c3f in mainline for uspace/lib/nic/src/nic_impl.c

Timestamp:

2012-01-21T23:55:03Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

c38e417

Parents:

86c71de (diff), e98fe28c (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:

Merge with mainline

File:

• uspace/lib/nic/src/nic_impl.c (modified) (2 diffs)

uspace/lib/nic/src/nic_impl.c

@@ -85 +85 @@
         }
         if (state == NIC_STATE_ACTIVE) {
-                if (nic_data->nil_session == NULL || nic_data->net_session == NULL
-                    || nic_data->device_id < 0) {
+                if (nic_data->nil_session == NULL || nic_data->device_id < 0) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);
                         return EINVAL;
@@ -805 +804 @@
 }
 
-/** Default implementation of the device_added method
- *
- * Just calls nic_ready.
- *
- * @param dev
- *
- */
-void nic_device_added_impl(ddf_dev_t *dev)
-{
-        nic_ready((nic_t *) dev->driver_data);
-}
-
 /**
  * Default handler for unknown methods (outside of the NIC interface).