[Click] e1000e poll patch

[Joonwoo Park]

Hi Alan,

On Sun, Jan 24, 2010 at 5:08 PM, mick woods <treecarver at gmail.com> wrote:
> Hi Joonwoo
> thanks for your help
> I have managed to get the patch installed, though I did have to
> comment out the following lines of your patch
>
> #diff --git a/src/Build b/src/Build
> #index 0694955..10315be 100755
> #--- a/src/Build
> #+++ b/src/Build
> #@@ -1,2 +1,2 @@
> ##!/bin/sh
> #-make KSP=/home/joonwpark/SRC4/linux
> #+make KSP=/home/joonwpark/SRC5/linux
>
> as there is no Build directory in the path

Sorry about that.
That was my fault.  You are right.
You have to comment out.
Actually Roman posted revised patch which doesn't have those lines.

>
> I am now trying to make the file and am getting a number of errors
>
> I am in the /home/alan/Desktop/e1000e-0.4.1.7/src directory and run
> make clean then make. I get the following errors
>
> root at click-intel:/home/alan/Desktop/e1000e-0.4.1.7/src# make
> make -C /lib/modules/2.6.24-26-generic/build
> SUBDIRS=/home/alan/Desktop/e1000e-0.4.1.7/src modules
> make[1]: Entering directory `/usr/src/linux-headers-2.6.24-26-generic'
>  CC [M]  /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.o
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c: In function ‘e1000_rx_refill’:
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5249: warning: label
> ‘map_skb’ defined but not used
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5234: warning: unused
> variable ‘skb’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c: In function ‘e1000_poll_off’:
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5433: error: ‘struct
> net_device’ has no member named ‘polling’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5434: error: ‘struct
> net_device’ has no member named ‘polling’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c: In function ‘e1000_poll_on’:
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5447: error: ‘struct
> net_device’ has no member named ‘polling’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5451: error: ‘struct
> net_device’ has no member named ‘polling’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c: In function ‘e1000_probe’:
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5598: error: ‘struct
> net_device’ has no member named ‘polling’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5599: error: ‘struct
> net_device’ has no member named ‘rx_poll’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5600: error: ‘struct
> net_device’ has no member named ‘rx_refill’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5601: error: ‘struct
> net_device’ has no member named ‘tx_queue’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5602: error: ‘struct
> net_device’ has no member named ‘tx_eob’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5603: error: ‘struct
> net_device’ has no member named ‘tx_start’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5604: error: ‘struct
> net_device’ has no member named ‘tx_clean’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5605: error: ‘struct
> net_device’ has no member named ‘poll_off’
> /home/alan/Desktop/e1000e-0.4.1.7/src/netdev.c:5606: error: ‘struct
> net_device’ has no member named ‘poll_on’
> make[2]: *** [/home/alan/Desktop/e1000e-0.4.1.7/src/netdev.o] Error 1
> make[1]: *** [_module_/home/alan/Desktop/e1000e-0.4.1.7/src] Error 2
> make[1]: Leaving directory `/usr/src/linux-headers-2.6.24-26-generic'
> make: *** [default] Error 2
>
>
> I have checked the netdev.c file and it has bee modified with the
> members that the make says are missing.

It seems to me you haven't applied click polling patch to your linux source.
Please make sure you've applied click/etc/linux-2.6.24.7.patch (if you
are using 2.6.24.7) to your linux source.

>
> The driver was downloaded from Intel as I could not find a e1000e
> driver in the git repository.
>
> Sorry to trouble you but do you have a possible solution to the make
> problem, I need to get polling working for a demostration next week

No problem.  But please don't forget to cc click list.

Joonwoo

>
> thanks
> alan
>
>
>
> On Fri, Jan 22, 2010 at 7:44 AM, Joonwoo Park <joonwpark81 at gmail.com> wrote:
>> man patch says : patch -pnum <patchfile
>>
>> Please try something like
>> --
>> bash-3.2$ pwd
>> /home/joonwpark/SRC/click/e1000e/e1000e-0.4.1.7
>> bash-3.2$ ls ../
>> e1000e-0.4.1.7  e1000e-0.4.1.7-click-polling.patch  e1000e-0.4.1.7.tar.gz
>> bash-3.2$ patch -p1 < ../e1000e-0.4.1.7-click-polling.patch
>> patching file src/netdev.c
>> bash-3.2$
>> --
>>
>> Joonwoo
>>
>> On Wed, Jan 20, 2010 at 8:36 PM, mick woods <treecarver at gmail.com> wrote:
>>> Hi all thanks for your help so far, I am trying to install the patch
>>> submitted by Joonwoo Park.
>>>
>>> I have the e1000e-0.4.1.7 driver installed and working correctly.
>>>
>>> When I try to install the patch  it will not install correctly, listed
>>> below is the error
>>>
>>> root at click-intel:/home/alan/Desktop/e1000e-0.4.1.7#  bzip2 -dc
>>> /home/alan/Desktop/e1000e-0.4.1.7/e1000e-0.4.1.7-click-polling.patch.tar.bz2|patch
>>> -p1 --dry-run
>>> can't find file to patch at input line 5
>>> Perhaps you used the wrong -p or --strip option?
>>> The text leading up to this was:
>>> --------------------------
>>> |e1000e-0.4.1.7-click-polling.patch0000644000175000017500000002265411325704230014737
>>> 0ustar  alanalandiff --git a/src/Build b/src/Build
>>> |index 0694955..10315be 100755
>>> |--- a/src/Build
>>> |+++ b/src/Build
>>> --------------------------
>>> File to patch:
>>>
>>>
>>> others appear to have been successfull in implementing this patch so
>>> I'm sure its something I am doing but my knowledge of patching is
>>> limited. I have tried |patch -p1 e1000e-0.4.1.7-click-polling.patch
>>> --dry-run and it just hangs
>>>
>>> your help would be appreciated on this
>>>
>>> thanks
>>> alan
>>> _______________________________________________
>>> click mailing list
>>> click at amsterdam.lcs.mit.edu
>>> https://amsterdam.lcs.mit.edu/mailman/listinfo/click
>>>
>>
>