Changeset dfda6a1 in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2010-10-23T20:28:55Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cc8d91a

Parents:

33dbbd2 (diff), 018d79b8 (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:

• uspace/srv/net/il/ip/ip.c (modified) (2 diffs)

uspace/srv/net/il/ip/ip.c

@@ -67 +67 @@
 #include <ip_client.h>
 #include <ip_interface.h>
+#include <ip_header.h>
 #include <net_interface.h>
 #include <nil_interface.h>
@@ -77 +78 @@
 
 #include "ip.h"
-#include "ip_header.h"
 #include "ip_module.h"
 #include "ip_local.h"