linux/drivers/net, branch v2.6.13

Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

2005-08-28T01:05:14Z

[PATCH] Fix 6pack setting of MAC address

2005-08-27T08:32:39Z

Don't check type of sax25_family; dev_set_mac_address has already done that before and anyway, the type to check against would have been ARPHRD_AX25. We only got away because AF_AX25 and ARPHRD_AX25 both happen to be defined to the same value. Don't check sax25_ndigis either; it's value is insignificant for the purpose of setting the MAC address and the check has shown to break some application software for no good reason. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: Jeff Garzik

[PATCH] 6pack Timer initialization

2005-08-27T08:32:39Z

I dropped the timer initialization bits by accident when sending the p-persistence fix. This patch gets the driver to work again on halfduplex links. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: Jeff Garzik

Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git

2005-08-26T23:32:31Z

[PATCH] bogus iounmap() in emac

2005-08-26T23:30:30Z

Dumb typo: iounmap(&local_pointer_variable). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

[TG3]: Fix ethtool loopback test lockup

2005-08-25T22:31:41Z

The tg3_abort_hw() call in tg3_test_loopback() is causing lockups on some devices. tg3_abort_hw() disables the memory arbiter, causing tg3_reset_hw() to hang when it tries to write the pre-reset signature. tg3_abort_hw() should only be called after the pre-reset signature has been written. This is all done in tg3_reset_hw() so the tg3_abort_hw() call is unnecessary and can be removed. [ Also bump driver version and release date. -DaveM ] Signed-off-by: Michael Chan Signed-off-by: David S. Miller

[PATCH] emac netpoll fix

2005-08-24T01:43:45Z

netpoll is void(struct net_device *), not int(struct net_device *) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

[PATCH] Kconfig fix (emac dependencient)

2005-08-24T01:43:43Z

emac doesn't build modular; ibm_emac_debug doesn't build at all (missing headers). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

[PATCH] Kconfig fix (airo_cs on m32r)

2005-08-24T01:43:41Z

airo_cs is broken on m32r; marked as such. [Proper fix would involve separating PCI-dependent parts and making sure they don't get in the way _and_ arranging for asm/scatterlist.h getting picked on m32r] Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

[PATCH] Kconfig fix (tms380tr and ISA_DMA_API)

2005-08-24T01:43:41Z

ISA parts of tms380tr are using ISA DMA helpers and should depend on ISA_DMA_API. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds