From owner-freebsd-hackers@FreeBSD.ORG Wed Aug 22 21:29:18 2007 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDDD116A418 for ; Wed, 22 Aug 2007 21:29:18 +0000 (UTC) (envelope-from sbruno@miralink.com) Received: from plato.miralink.com (mail.miralink.com [70.103.185.20]) by mx1.freebsd.org (Postfix) with ESMTP id 9E8EC13C467 for ; Wed, 22 Aug 2007 21:29:18 +0000 (UTC) (envelope-from sbruno@miralink.com) Received: from localhost (localhost.localdomain [127.0.0.1]) by plato.miralink.com (Postfix) with ESMTP id E3546619CFB for ; Wed, 22 Aug 2007 14:05:30 -0700 (PDT) Received: from plato.miralink.com ([127.0.0.1]) by localhost (plato.miralink.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 16789-01 for ; Wed, 22 Aug 2007 14:05:29 -0700 (PDT) Received: from [10.0.0.40] (iago.office.miralink.com [10.0.0.40]) by plato.miralink.com (Postfix) with ESMTP id C6C62619B85 for ; Wed, 22 Aug 2007 14:05:29 -0700 (PDT) Message-ID: <46CCA519.9080303@miralink.com> Date: Wed, 22 Aug 2007 14:05:29 -0700 From: Sean Bruno User-Agent: Thunderbird 1.5.0.12 (X11/20070719) MIME-Version: 1.0 To: freebsd-hackers@freebsd.org Content-Type: multipart/mixed; boundary="------------000608040502020106040109" X-DSPAM-Result: Innocent X-DSPAM-Processed: Wed Aug 22 14:05:30 2007 X-DSPAM-Confidence: 0.9997 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 46cca51a207591542430122 X-DSPAM-Factors: 27, X-Virus-Scanned: amavisd-new at X-Spam-Status: No, score=-4.494 tagged_above=-10 required=6.6 autolearn=ham tests=[ALL_TRUSTED=-1.8, AWL=0.005, BAYES_00=-2.599, DSPAM_HAM=-0.1] X-Spam-Score: -4.494 X-Spam-Level: Subject: Relocatable intel 'em' driver patch(intel v6.4.1) X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Aug 2007 21:29:19 -0000 This is a multi-part message in MIME format. --------------000608040502020106040109 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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? --------------000608040502020106040109 Content-Type: text/x-patch; name="intel_em.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="intel_em.diff" 38c38 < #include "e1000_80003es2lan.h" --- > #include 38c38 < #include "e1000_api.h" --- > #include 42c42 < #include "e1000_api.h" --- > #include 41c41 < #include "e1000_82541.h" --- > #include 38c38 < #include "e1000_api.h" --- > #include 38c38 < #include "e1000_api.h" --- > #include 39c39 < #include "e1000_82543.h" --- > #include 38c38 < #include "e1000_api.h" --- > #include 40c40 < #include "e1000_82571.h" --- > #include 38c38 < #include "e1000_api.h" --- > #include 35,37c35,37 < #include "e1000_mac.h" < #include "e1000_nvm.h" < #include "e1000_phy.h" --- > #include > #include > #include 38c38 < #include "e1000_hw.h" --- > #include 38,40c38,40 < #include "e1000_osdep.h" < #include "e1000_regs.h" < #include "e1000_defines.h" --- > #include > #include > #include 497,500c497,500 < #include "e1000_mac.h" < #include "e1000_phy.h" < #include "e1000_nvm.h" < #include "e1000_manage.h" --- > #include > #include > #include > #include 39c39 < #include "e1000_ich8lan.h" --- > #include 38c38 < #include "e1000_api.h" --- > #include 35c35 < #include "e1000_mac.h" --- > #include 38c38 < #include "e1000_api.h" --- > #include 35c35 < #include "e1000_manage.h" --- > #include 38c38 < #include "e1000_api.h" --- > #include 35c35 < #include "e1000_nvm.h" --- > #include 38c38 < #include "e1000_api.h" --- > #include 35c35 < #include "e1000_phy.h" --- > #include 51c51 < #include "e1000_api.h" --- > #include 81,82c81,82 < #include "e1000_api.h" < #include "if_e1000.h" --- > #include > #include 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 --------------000608040502020106040109--