A collection of minor changes, mostly bug fixes. This also includes Adrian's hostap.c rename to hostap_main.c (acked by Jouni).
I went ahead and pulled-in my e1000 changes and my fec_8xx Kconfig
change. I don't think they are controversial. (I copied the e1000
guys on those patches, and they didn't scream. Someone from the PPC
camp acked the fec_8xx patch.)
Thanks,
John
---
The following changes since commit cd52d1ee9a92587b242d946a2300a3245d3b885a:
Linus Torvalds:
Linux v2.6.15-rc1
are found in the git repository at:
git://git.tuxdriver.com/git/netdev-jwl.git upstream-jgarzik
Adrian Bunk:
drivers/net/sk98lin/skge.c: make SkPciWriteCfgDWord() a static inline
hostap: rename hostap.c to hostap_main.c
Carlo Perassi:
atmel: CodingStyle cleanup
Christophe Lucas:
atmel: audit return code of create_proc_read_entry
James Ketrenos:
ipw2100: Fix 'Driver using old /proc/net/wireless...' message
John W. Linville:
e1000: avoid leak when e1000_setup_loopback_test fails
e1000: zero-out pointers in e1000_free_desc_rings
fec_8xx: make CONFIG_FEC_8XX depend on CONFIG_8xx
skge: fix warning from inlining SkPciWriteCfgDWord()
Merge branch 'linville-e1000'
Merge branch 'linville-fec_8xx'
Krzysztof Halasa:
Generic HDLC WAN drivers - disable netif_carrier_off()
Tobias Klauser:
Remove drivers/net/wan/lmc/lmc_prot.h
drivers/net/e1000/e1000_ethtool.c | 16
drivers/net/fec_8xx/Kconfig | 2
drivers/net/sk98lin/h/skdrv2nd.h | 1
drivers/net/sk98lin/h/skvpd.h | 8
drivers/net/sk98lin/skge.c | 43 -
drivers/net/wan/hdlc_cisco.c | 6
drivers/net/wan/hdlc_fr.c | 4
drivers/net/wan/hdlc_generic.c | 6
drivers/net/wan/lmc/lmc_prot.h | 15
drivers/net/wireless/atmel.c | 1490 +++++++++++++++--------------
drivers/net/wireless/hostap/Makefile | 1
drivers/net/wireless/hostap/hostap_main.c | 0
drivers/net/wireless/ipw2100.c | 29 -
drivers/net/wireless/ipw2100.h | 2
14 files changed, 834 insertions(+), 789 deletions(-)
delete mode 100644 drivers/net/wan/lmc/lmc_prot.h
rename drivers/net/wireless/hostap/{hostap.c => hostap_main.c} (100%)
Patch included as a bzip2'ed attachment due to size concerns.
--
John W. Linville
[EMAIL PROTECTED]
upstream-jgarzik.patch.bz2
Description: BZip2 compressed data
