Changeset 8a9a41e in mainline for uspace/srv/net/ethip/arp.h


Ignore:
Timestamp:
2021-10-24T08:28:43Z (3 years ago)
Author:
GitHub <noreply@…>
Children:
f628215
Parents:
2ce943a (diff), cd981f2a (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.
git-author:
Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)
git-committer:
GitHub <noreply@…> (2021-10-24 08:28:43)
Message:

Merge branch 'HelenOS:master' into master

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/ethip/arp.h

    r2ce943a r8a9a41e  
    11/*
    2  * Copyright (c) 2012 Jiri Svoboda
     2 * Copyright (c) 2021 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    3838#define ARP_H_
    3939
     40#include <inet/addr.h>
     41#include <inet/eth_addr.h>
    4042#include <inet/iplink_srv.h>
    41 #include <inet/addr.h>
    4243#include "ethip.h"
    4344
    4445extern void arp_received(ethip_nic_t *, eth_frame_t *);
    45 extern errno_t arp_translate(ethip_nic_t *, addr32_t, addr32_t, addr48_t);
     46extern errno_t arp_translate(ethip_nic_t *, addr32_t, addr32_t, eth_addr_t *);
    4647
    4748#endif
Note: See TracChangeset for help on using the changeset viewer.