Changes in uspace/srv/net/ethip/ethip.c [b4edc96:fafb8e5] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/ethip/ethip.c
rb4edc96 rfafb8e5 1 1 /* 2 * Copyright (c) 20 21Jiri Svoboda2 * Copyright (c) 2012 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 39 39 #include <async.h> 40 40 #include <errno.h> 41 #include <inet/eth_addr.h>42 41 #include <inet/iplink_srv.h> 43 42 #include <io/log.h> … … 59 58 static errno_t ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu); 60 59 static errno_t ethip_get_mtu(iplink_srv_t *srv, size_t *mtu); 61 static errno_t ethip_get_mac48(iplink_srv_t *srv, eth_addr_t *mac);62 static errno_t ethip_set_mac48(iplink_srv_t *srv, eth_addr_t *mac);60 static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac); 61 static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac); 63 62 static errno_t ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr); 64 63 static errno_t ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr); … … 178 177 eth_frame_t frame; 179 178 180 errno_t rc = arp_translate(nic, sdu->src, sdu->dest, &frame.dest);179 errno_t rc = arp_translate(nic, sdu->src, sdu->dest, frame.dest); 181 180 if (rc != EOK) { 182 181 log_msg(LOG_DEFAULT, LVL_WARN, "Failed to look up IPv4 address 0x%" … … 185 184 } 186 185 187 frame.src = nic->mac_addr;186 addr48(nic->mac_addr, frame.src); 188 187 frame.etype_len = ETYPE_IP; 189 188 frame.data = sdu->data; … … 209 208 eth_frame_t frame; 210 209 211 frame.dest = sdu->dest;212 frame.src = nic->mac_addr;210 addr48(sdu->dest, frame.dest); 211 addr48(nic->mac_addr, frame.src); 213 212 frame.etype_len = ETYPE_IPV6; 214 213 frame.data = sdu->data; … … 277 276 } 278 277 279 static errno_t ethip_get_mac48(iplink_srv_t *srv, eth_addr_t *mac)278 static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac) 280 279 { 281 280 log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mac48()"); 282 281 283 282 ethip_nic_t *nic = (ethip_nic_t *) srv->arg; 284 *mac = nic->mac_addr;285 286 return EOK; 287 } 288 289 static errno_t ethip_set_mac48(iplink_srv_t *srv, eth_addr_t *mac)283 addr48(nic->mac_addr, *mac); 284 285 return EOK; 286 } 287 288 static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac) 290 289 { 291 290 log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_set_mac48()"); 292 291 293 292 ethip_nic_t *nic = (ethip_nic_t *) srv->arg; 294 nic->mac_addr = *mac;293 addr48(*mac, nic->mac_addr); 295 294 296 295 return EOK;
Note:
See TracChangeset
for help on using the changeset viewer.