Changeset fedac2f in mainline for uspace/srv/net/ethip/arp.c

Timestamp:

2012-09-16T11:27:35Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

289fa65

Parents:

8930624 (diff), 00b4a68 (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/arp.c (modified) (3 diffs)

uspace/srv/net/ethip/arp.c

@@ -59 +59 @@
         ethip_link_addr_t *laddr;
 
-        log_msg(LVL_DEBUG, "arp_received()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_received()");
 
         rc = arp_pdu_decode(frame->data, frame->size, &packet);
@@ -65 +65 @@
                 return;
 
-        log_msg(LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x",
             packet.opcode, packet.target_proto_addr.ipv4);
 
         laddr = ethip_nic_addr_find(nic, &packet.target_proto_addr);
         if (laddr != NULL) {
-                log_msg(LVL_DEBUG, "Request/reply to my address");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Request/reply to my address");
 
                 (void) atrans_add(&packet.sender_proto_addr,
@@ -122 +122 @@
         size_t fsize;
 
-        log_msg(LVL_DEBUG, "arp_send_packet()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_send_packet()");
 
         rc = arp_pdu_encode(packet, &pdata, &psize);