Changeset 1f1fa64 in mainline for uspace/drv/nic

Timestamp:

2014-07-28T21:53:11Z (11 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

c3b25985, f2f4c00

Parents:

cbfece7 (diff), 7eb6c96 (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:

Make MAC address change possible on ethip side. Merge mainline changes.

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (1 diff)
• rtl8169/driver.c (modified) (1 diff)

uspace/drv/nic/e1k/e1k.c

@@ -71 +71 @@
 /** ddf_fun_t * -> nic_driver_data_t* cast */
 #define NIC_DATA_FUN(fun) \
-        ((nic_t *) ddf_fun_data_get(fun))
+        ((nic_t *) ddf_dev_data_get(ddf_fun_get_dev(fun)))
 
 /** ddf_dev_t * -> nic_driver_data_t* cast */

uspace/drv/nic/rtl8169/driver.c

@@ -439 +439 @@
         nic_set_ddf_fun(nic_data, fun);
         ddf_fun_set_ops(fun, &rtl8169_dev_ops);
-        ddf_fun_data_implant(fun, nic_data);
+//      ddf_fun_data_implant(fun, nic_data);
 
         rc = ddf_fun_bind(fun);