Ignore:
Timestamp:
2010-12-25T21:20:28Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
631ee0c
Parents:
1bfd3d3 (diff), 09178b7f (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 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/net/include/netif_local.h

    r1bfd3d3 r973ef9fc  
    111111 *                      message implementation.
    112112 */
    113 extern int netif_send_message(device_id_t device_id, packet_t packet,
     113extern int netif_send_message(device_id_t device_id, packet_t *packet,
    114114    services_t sender);
    115115
     
    198198    char **);
    199199extern int netif_probe_req_local(int, device_id_t, int, int);
    200 extern int netif_send_msg_local(int, device_id_t, packet_t, services_t);
     200extern int netif_send_msg_local(int, device_id_t, packet_t *, services_t);
    201201extern int netif_start_req_local(int, device_id_t);
    202202extern int netif_stop_req_local(int, device_id_t);
     
    208208extern void null_device_stats(device_stats_t *);
    209209extern void netif_pq_release(packet_id_t);
    210 extern packet_t netif_packet_get_1(size_t);
     210extern packet_t *netif_packet_get_1(size_t);
    211211extern int netif_init_module(async_client_conn_t);
    212212
Note: See TracChangeset for help on using the changeset viewer.