Changeset f14291b in mainline for uspace/lib/net/include/netif_local.h

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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:

• uspace/lib/net/include/netif_local.h (modified) (2 diffs)

uspace/lib/net/include/netif_local.h

@@ -34 +34 @@
  * Network interface module skeleton.
  * The skeleton has to be part of each network interface module.
- * The skeleton can be also part of the module bundled with the network interface layer.
  */
 
@@ -44 +43 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <err.h>
 
 #include <adt/measured_strings.h>
-#include <net_err.h>
-#include <net_device.h>
-#include <packet/packet.h>
+#include <net/device.h>
+#include <net/packet.h>
 
 /** Network interface device specific data.