I did a small amount of search and replace against the intel em ethernet
driver to allow it to be relocatable today. If anyone is interested,
here is the diff against my tree.
So, one should be able to copy v6.4.1 of the intel driver into the
kernel src tree, overwriting RELENG_6's version and apply this diff.
I've tested it a couple of times, but buyer beware. This might just be
a good reference for someone wanting to do the same thing I needed to do.
sean
P.S I'm not sure of the history here, but is there any specific reason
that this driver is being maintained outside of the mainline kernel
branches?
38c38
< #include "e1000_80003es2lan.h"
---
> #include <dev/em/e1000_80003es2lan.h>
38c38
< #include "e1000_api.h"
---
> #include <dev/em/e1000_api.h>
42c42
< #include "e1000_api.h"
---
> #include <dev/em/e1000_api.h>
41c41
< #include "e1000_82541.h"
---
> #include <dev/em/e1000_82541.h>
38c38
< #include "e1000_api.h"
---
> #include <dev/em/e1000_api.h>
38c38
< #include "e1000_api.h"
---
> #include <dev/em/e1000_api.h>
39c39
< #include "e1000_82543.h"
---
> #include <dev/em/e1000_82543.h>
38c38
< #include "e1000_api.h"
---
> #include <dev/em/e1000_api.h>
40c40
< #include "e1000_82571.h"
---
> #include <dev/em/e1000_82571.h>
38c38
< #include "e1000_api.h"
---
> #include <dev/em/e1000_api.h>
35,37c35,37
< #include "e1000_mac.h"
< #include "e1000_nvm.h"
< #include "e1000_phy.h"
---
> #include <dev/em/e1000_mac.h>
> #include <dev/em/e1000_nvm.h>
> #include <dev/em/e1000_phy.h>
38c38
< #include "e1000_hw.h"
---
> #include <dev/em/e1000_hw.h>
38,40c38,40
< #include "e1000_osdep.h"
< #include "e1000_regs.h"
< #include "e1000_defines.h"
---
> #include <dev/em/e1000_osdep.h>
> #include <dev/em/e1000_regs.h>
> #include <dev/em/e1000_defines.h>
497,500c497,500
< #include "e1000_mac.h"
< #include "e1000_phy.h"
< #include "e1000_nvm.h"
< #include "e1000_manage.h"
---
> #include <dev/em/e1000_mac.h>
> #include <dev/em/e1000_phy.h>
> #include <dev/em/e1000_nvm.h>
> #include <dev/em/e1000_manage.h>
39c39
< #include "e1000_ich8lan.h"
---
> #include <dev/em/e1000_ich8lan.h>
38c38
< #include "e1000_api.h"
---
> #include <dev/em/e1000_api.h>
35c35
< #include "e1000_mac.h"
---
> #include <dev/em/e1000_mac.h>
38c38
< #include "e1000_api.h"
---
> #include <dev/em/e1000_api.h>
35c35
< #include "e1000_manage.h"
---
> #include <dev/em/e1000_manage.h>
38c38
< #include "e1000_api.h"
---
> #include <dev/em/e1000_api.h>
35c35
< #include "e1000_nvm.h"
---
> #include <dev/em/e1000_nvm.h>
38c38
< #include "e1000_api.h"
---
> #include <dev/em/e1000_api.h>
35c35
< #include "e1000_phy.h"
---
> #include <dev/em/e1000_phy.h>
51c51
< #include "e1000_api.h"
---
> #include <dev/em/e1000_api.h>
81,82c81,82
< #include "e1000_api.h"
< #include "if_e1000.h"
---
> #include <dev/em/e1000_api.h>
> #include <dev/em/if_e1000.h>
6,10c6,10
< SRCS = device_if.h bus_if.h pci_if.h opt_bdg.h
< SRCS += if_e1000.c $(SHARED_SRCS)
< SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
< SHARED_SRCS += e1000_80003es2lan.c e1000_82542.c e1000_82541.c e1000_82543.c
< SHARED_SRCS += e1000_82540.c e1000_ich8lan.c e1000_82571.c
---
> SRCS = device_if.h bus_if.h pci_if.h opt_bdg.h \
> if_e1000.c e1000_api.c e1000_phy.c e1000_nvm.c \
> e1000_mac.c e1000_manage.c e1000_80003es2lan.c \
> e1000_82542.c e1000_82541.c e1000_82543.c \
> e1000_82540.c e1000_ich8lan.c e1000_82571.c
14c14
< CFLAGS += -I/usr/src/sys/dev/em
---
> #CFLAGS += -I../../dev/em
_______________________________________________
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
