Changeset bf1733d3 in mainline for uspace/lib/c/include/ipc


Ignore:
Timestamp:
2015-04-27T20:24:41Z (11 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2b5d966
Parents:
c1fd281 (diff), dcba819 (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

Location:
uspace/lib/c/include/ipc
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/ipc/dev_iface.h

    rc1fd281 rbf1733d3  
    4848        /** Network interface controller interface */
    4949        NIC_DEV_IFACE,
     50               
     51        /** IEEE 802.11 interface controller interface */
     52        IEEE80211_DEV_IFACE,
    5053       
    5154        /** Interface provided by any PCI device. */

  • uspace/lib/c/include/ipc/dhcp.h

    rc1fd281 rbf1733d3  
    4141typedef enum {
    4242        DHCP_LINK_ADD = IPC_FIRST_USER_METHOD,
    43         DHCP_LINK_REMOVE
     43        DHCP_LINK_REMOVE,
     44        DHCP_DISCOVER
    4445} dhcp_request_t;
    4546
Note: See TracChangeset for help on using the changeset viewer.