[Click] Unable to patch e1000 for Linux 2.6.24.7

Martti Kuparinen martti.kuparinen at iki.fi
Fri Feb 5 07:39:11 EST 2010


Hi!

I'm unable to patch the e1000 drivers for Linux 2.6.24.7, am I doing something 
wrong here? It looks like e1000-7.3.20-polling.patch is not up to date...

Martti


ROOT router:~/click> git pull -v
 From git://read.cs.ucla.edu/git/click
  = [up to date]      clicky     -> origin/clicky
  = [up to date]      master     -> origin/master
Already up-to-date.


ROOT router:~> rm -rf linux-2.6.24.7
ROOT router:~> tar xjf linux-2.6.24.7.tar.bz2
ROOT router:~> cd linux-2.6.24.7/drivers/net/e1000
ROOT router:~/linux-2.6.24.7/drivers/net/e1000> patch -p2 < 
~/click/drivers/e1000-7.3.20-polling.patch
patching file Makefile
Hunk #1 FAILED at 146.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
patching file e1000.h
Hunk #1 succeeded at 103 (offset -7 lines).
Hunk #2 succeeded at 230 (offset -12 lines).
Hunk #3 succeeded at 348 (offset -34 lines).
patching file e1000_main.c
Hunk #1 succeeded at 156 (offset -8 lines).
Hunk #2 FAILED at 218.
Hunk #3 succeeded at 285 (offset -39 lines).
Hunk #4 succeeded at 876 (offset -63 lines).
Hunk #5 succeeded at 932 (offset -62 lines).
Hunk #6 FAILED at 968.
Hunk #7 FAILED at 1076.
Hunk #8 succeeded at 2593 (offset -88 lines).
Hunk #9 FAILED at 2781.
Hunk #10 FAILED at 4381.
Hunk #11 FAILED at 4574.
Hunk #12 succeeded at 5363 with fuzz 2 (offset -213 lines).
6 out of 12 hunks FAILED -- saving rejects to file e1000_main.c.rej
patching file e1000_param.c
Hunk #1 succeeded at 369 (offset -31 lines).


More information about the click mailing list