Changeset c42f50d in mainline for uspace/srv/net/dhcp/dhcp.h


Ignore:
Timestamp:
2013-10-05T11:53:43Z (12 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cbfc8b7
Parents:
408424e (diff), 3e896e1 (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:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/dhcp/dhcp.h

    r408424e rc42f50d  
    11/*
    2  * Copyright (c) 2013 Martin Decky
     2 * Copyright (c) 2013 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup inet
     29/** @addtogroup dhcp
    3030 * @{
    3131 */
     
    3535 */
    3636
    37 #ifndef INETPING6_H_
    38 #define INETPING6_H_
     37#ifndef DHCP_H
     38#define DHCP_H
    3939
    40 #include "inetsrv.h"
     40#include <ipc/loc.h>
    4141
    42 extern void inetping6_conn(ipc_callid_t, ipc_call_t *, void *);
    43 extern int inetping6_recv(uint16_t, inetping6_sdu_t *);
     42extern void dhcpsrv_links_init(void);
     43extern int dhcpsrv_link_add(service_id_t);
     44extern int dhcpsrv_link_remove(service_id_t);
    4445
    4546#endif
Note: See TracChangeset for help on using the changeset viewer.