Changeset 15d0046 in mainline for uspace/srv/net/ethip/ethip.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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 mainline changes

File:

• uspace/srv/net/ethip/ethip.c (modified) (4 diffs)

uspace/srv/net/ethip/ethip.c

@@ -44 +44 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <task.h>
 #include "arp.h"
 #include "ethip.h"
@@ -58 +59 @@
 static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
 static int ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
+static int ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac);
 static int ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
 static int ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
@@ -70 +72 @@
         .get_mtu = ethip_get_mtu,
         .get_mac48 = ethip_get_mac48,
+        .set_mac48 = ethip_set_mac48,
         .addr_add = ethip_addr_add,
         .addr_remove = ethip_addr_remove
@@ -283 +286 @@
 }
 
+static int ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_set_mac48()");
+        
+        ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
+        addr48(*mac, nic->mac_addr);
+        
+        return EOK;
+}
+
 static int ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
 {