Changeset ef689ef0 in mainline for uspace/lib/net/netif/netif_local.c


Ignore:
Timestamp:
2010-10-14T22:08:50Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a7a85d16
Parents:
10056483 (diff), f63a591d (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/lib/net/netif/netif_local.c

    r10056483 ref689ef0  
    4444#include <err.h>
    4545
    46 #include <net_messages.h>
     46#include <generic.h>
    4747#include <net/modules.h>
    4848#include <net/packet.h>
    4949#include <packet_client.h>
    50 #include <packet/packet_server.h>
    5150#include <packet_remote.h>
    5251#include <adt/measured_strings.h>
    53 #include <net_device.h>
     52#include <net/device.h>
    5453#include <nil_interface.h>
    5554#include <netif_local.h>
Note: See TracChangeset for help on using the changeset viewer.