summaryrefslogtreecommitdiff
path: root/dde_e1000
diff options
context:
space:
mode:
authorZheng Da <zhengda1936@gmail.com>2010-05-31 17:21:47 +0200
committerZheng Da <zhengda1936@gmail.com>2010-05-31 17:21:47 +0200
commit2fe1437bd35016309e9ac4cfe57fb3daca3ba0a0 (patch)
treed3d82562d28483574caab94c6a35ae3ad3e92fc2 /dde_e1000
parent8be479740f0d7cdf8e78bf5c62ba934afdd9dca1 (diff)
make glue code of networking more independant.
This change is required for block device drivers. When block device drivers are linked to the glue code, the linker should be able to perform garbage collection and exclude the code of networking from the driver programs.
Diffstat (limited to 'dde_e1000')
-rw-r--r--dde_e1000/Makefile2
-rw-r--r--dde_e1000/main.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile
index bfe7dbaf..ffdc17ab 100644
--- a/dde_e1000/Makefile
+++ b/dde_e1000/Makefile
@@ -10,7 +10,7 @@ TARGET = dde_e1000
SRC_C = main.c e1000_ethtool.c e1000_hw.c e1000_main.c e1000_param.c
LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab
-CFLAGS += -g
+CFLAGS += -g -I/include
# DDE configuration
include $(L4DIR)/Makeconf
diff --git a/dde_e1000/main.c b/dde_e1000/main.c
index 8f04bfeb..98f4452a 100644
--- a/dde_e1000/main.c
+++ b/dde_e1000/main.c
@@ -6,13 +6,12 @@
#include <linux/init.h> // initcall()
#include <linux/delay.h> // msleep()
-int using_std = 1;
+#include <hurd/machdev.h>
-void netif_rx_handle (char *data, int len, struct net_device *dev);
+int using_std = 1;
int main(int argc, char **argv)
{
- extern void ds_server(void);
l4dde26_init();
l4dde26_process_init();
l4dde26_softirq_init();
@@ -22,6 +21,7 @@ int main(int argc, char **argv)
l4dde26_do_initcalls();
+ register_net();
mach_device_init();
trivfs_init();