Ignore:
Timestamp:
2010-11-20T17:10:35Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
32eceb4f, 8b3bff5
Parents:
0b4a67a (diff), dd5046dd (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 from lp:~jakub/helenos/net.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hw/netif/dp8390/dp8390_module.c

    r0b4a67a r7e1f9b7  
    103103        netif_device_t * device;
    104104        dpeth_t * dep;
    105         packet_t received;
     105        packet_t *received;
    106106        device_id_t device_id;
    107107        int phone;
     
    247247}
    248248
    249 int netif_send_message(device_id_t device_id, packet_t packet, services_t sender){
    250         netif_device_t * device;
    251         dpeth_t * dep;
    252         packet_t next;
     249int netif_send_message(device_id_t device_id, packet_t *packet, services_t sender){
     250        netif_device_t * device;
     251        dpeth_t * dep;
     252        packet_t *next;
    253253        int rc;
    254254
Note: See TracChangeset for help on using the changeset viewer.