2004-11-15 06:50:23

by Jeff Garzik

[permalink] [raw]
Subject: [netdrvr] netdev-2.4 queue updated


(this is waiting for the next Marcelo release, before going upstream)

BK users:

bk pull bk://gkernel.bkbits.net/netdev-2.4

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/patchkits/2.4/2.4.28-rc3-netdev1.patch.bz2

This will update the following files:

Documentation/Configure.help | 84 --
Documentation/networking/dl2k.txt | 44 -
Documentation/networking/e1000.txt | 216 +++--
drivers/net/3c59x.c | 500 ++++++++----
drivers/net/dl2k.c | 309 +++++--
drivers/net/dl2k.h | 19
drivers/net/e1000/e1000_ethtool.c | 6
drivers/net/e1000/e1000_hw.c | 25
drivers/net/e1000/e1000_main.c | 2
drivers/net/e1000/e1000_param.c | 2
drivers/net/forcedeth.c | 1020 ++++++++++++++++++--------
drivers/net/wireless/prism54/isl_38xx.c | 12
drivers/net/wireless/prism54/isl_38xx.h | 14
drivers/net/wireless/prism54/isl_ioctl.c | 24
drivers/net/wireless/prism54/islpci_dev.c | 8
drivers/net/wireless/prism54/islpci_dev.h | 2
drivers/net/wireless/prism54/islpci_hotplug.c | 2
drivers/net/wireless/prism54/prismcompat.h | 4
drivers/net/wireless/prism54/prismcompat24.h | 4
include/linux/mii.h | 7
include/linux/pci_ids.h | 11
21 files changed, 1524 insertions(+), 791 deletions(-)

through these ChangeSets:

<edward_peng:alphanetworks.com>:
o dl2k: correct author's email

Ganesh Venkatesan:
o e1000: Update to Configure.help
o e100: Update to Configure.help
o e1000: white space corrections
o e1000: driver version update
o e1000: fix set ringparam for ethtool returning error
o e1000: remove unused function e1000_enable_mng_pass_thru
o e1000: fix set_pauseparam for fiber serdes link
o e1000: Update Documentation/networking/e1000.txt

Jeff Garzik:
o [netdrvr dl2k] remove unused constant 'CFI'
o [netdrvr dl2k] new TX scheme, fix minor bug

John W. Linville:
o 3c59x: resync with 2.6

Manfred Spraul:
o Backport of the 0.30 forcedeth driver to 2.4. It's a new backport, starting from the 2.6 tree.

Margit Schubert-While:
o prism54 sparse fixes
o prism54 fix resume processing
o prism54 sync with 2.6


2004-11-15 15:09:57

by O.Sezer

[permalink] [raw]
Subject: Re: [netdrvr] netdev-2.4 queue updated

> John W. Linville:
> o 3c59x: resync with 2.6
>

Any specific reason that the following two are not included ?

3c59x: reload EEPROM values at rmmod for needy cards:
http://marc.theaimsgroup.com/?l=linux-kernel&m=109726032213947&w=2

3c59x: remove EEPROM_RESET for 3c905 :
http://marc.theaimsgroup.com/?l=linux-kernel&m=109802672909516&w=2

Regards,
Ozkan Sezer


2004-11-15 17:08:01

by Jeff Garzik

[permalink] [raw]
Subject: Re: [netdrvr] netdev-2.4 queue updated

O.Sezer wrote:
>> John W. Linville:
>> o 3c59x: resync with 2.6
>>
>
> Any specific reason that the following two are not included ?
>
> 3c59x: reload EEPROM values at rmmod for needy cards:
> http://marc.theaimsgroup.com/?l=linux-kernel&m=109726032213947&w=2
>
> 3c59x: remove EEPROM_RESET for 3c905 :
> http://marc.theaimsgroup.com/?l=linux-kernel&m=109802672909516&w=2

Ask John Linville... IIRC they caused problems?

Jeff



2004-11-15 17:32:52

by John W. Linville

[permalink] [raw]
Subject: Re: [netdrvr] netdev-2.4 queue updated

On Mon, Nov 15, 2004 at 12:06:22PM -0500, Jeff Garzik wrote:
> O.Sezer wrote:
> >>John W. Linville:
> >> o 3c59x: resync with 2.6
> >>
> >
> >Any specific reason that the following two are not included ?
> >
> >3c59x: reload EEPROM values at rmmod for needy cards:
> >http://marc.theaimsgroup.com/?l=linux-kernel&m=109726032213947&w=2
> >
> >3c59x: remove EEPROM_RESET for 3c905 :
> >http://marc.theaimsgroup.com/?l=linux-kernel&m=109802672909516&w=2
>
> Ask John Linville... IIRC they caused problems?

Actually, the second one was there to correct the first one.
(Only PART of the first patch was undone by the second one.)

They are additive, so they should be applied in the order above.
If you'd prefer, I could gen-up a single patch?

Thanks,

John
--
John W. Linville
[email protected]

2004-11-15 20:47:59

by O.Sezer

[permalink] [raw]
Subject: Re: [netdrvr] netdev-2.4 queue updated

John W. Linville wrote:
> On Mon, Nov 15, 2004 at 12:06:22PM -0500, Jeff Garzik wrote:
>
>>O.Sezer wrote:
>>
>>>>John W. Linville:
>>>> o 3c59x: resync with 2.6
>>>>
>>>
>>>Any specific reason that the following two are not included ?
>>>
>>>3c59x: reload EEPROM values at rmmod for needy cards:
>>>http://marc.theaimsgroup.com/?l=linux-kernel&m=109726032213947&w=2
>>>
>>>3c59x: remove EEPROM_RESET for 3c905 :
>>>http://marc.theaimsgroup.com/?l=linux-kernel&m=109802672909516&w=2
>>
>>Ask John Linville... IIRC they caused problems?
>

I have two machines with 3c905's (Boomerang series) running with
Linville's 3 patches without any problems for more than 10 days I
think. But that's only me.

> Actually, the second one was there to correct the first one.
> (Only PART of the first patch was undone by the second one.)

I'm aware of that, thanks.

> They are additive, so they should be applied in the order above.
> If you'd prefer, I could gen-up a single patch?
>
> Thanks,
>
> John

Ozkan Sezer

2004-11-15 22:50:26

by Jeff Garzik

[permalink] [raw]
Subject: Re: [netdrvr] netdev-2.4 queue updated

John W. Linville wrote:
> On Mon, Nov 15, 2004 at 12:06:22PM -0500, Jeff Garzik wrote:
>
>>O.Sezer wrote:
>>
>>>>John W. Linville:
>>>> o 3c59x: resync with 2.6
>>>>
>>>
>>>Any specific reason that the following two are not included ?
>>>
>>>3c59x: reload EEPROM values at rmmod for needy cards:
>>>http://marc.theaimsgroup.com/?l=linux-kernel&m=109726032213947&w=2
>>>
>>>3c59x: remove EEPROM_RESET for 3c905 :
>>>http://marc.theaimsgroup.com/?l=linux-kernel&m=109802672909516&w=2
>>
>>Ask John Linville... IIRC they caused problems?
>
>
> Actually, the second one was there to correct the first one.
> (Only PART of the first patch was undone by the second one.)
>
> They are additive, so they should be applied in the order above.
> If you'd prefer, I could gen-up a single patch?

Well, overall, if the netdev-2.4 queue is missing patches, please resend
them. one or many patches, doesn't matter.

Jeff