Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (0827f2b6) · Commits · 戴 / test

arch/ppc/syslib/mv64x60.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -313,7 +313,7 @@ static struct platform_device mpsc1_device = {
		};
		#endif

		#ifdef CONFIG_MV643XX_ETH
		#if defined(CONFIG_MV643XX_ETH) \|\| defined(CONFIG_MV643XX_ETH_MODULE)
		static struct resource mv64x60_eth_shared_resources[] = {
		[0] = {
		.name = "ethernet shared base",
		@@ -456,7 +456,7 @@ static struct platform_device *mv64x60_pd_devs[] __initdata = {
		&mpsc0_device,
		&mpsc1_device,
		#endif
		#ifdef CONFIG_MV643XX_ETH
		#if defined(CONFIG_MV643XX_ETH) \|\| defined(CONFIG_MV643XX_ETH_MODULE)
		&mv64x60_eth_shared_device,
		#endif
		#ifdef CONFIG_MV643XX_ETH_0

drivers/net/Kconfig

+25 −3

Original line number	Diff line number	Diff line
		@@ -2034,13 +2034,28 @@ config SKGE
		It does not support the link failover and network management
		features that "portable" vendor supplied sk98lin driver does.

		This driver supports adapters based on the original Yukon chipset:
		Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T,
		Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872.

		It does not support the newer Yukon2 chipset: a separate driver,
		sky2, is provided for Yukon2-based adapters.

		To compile this driver as a module, choose M here: the module
		will be called skge. This is recommended.

		config SKY2
		tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
		depends on PCI && EXPERIMENTAL
		select CRC32
		---help---
		This driver support the Marvell Yukon 2 Gigabit Ethernet adapter.
		This driver supports Gigabit Ethernet adapters based on the the
		Marvell Yukon 2 chipset:
		Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
		88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21

		This driver does not support the original Yukon chipset: a seperate
		driver, skge, is provided for Yukon-based adapters.

		To compile this driver as a module, choose M here: the module
		will be called sky2. This is recommended.
		@@ -2050,8 +2065,15 @@ config SK98LIN
		depends on PCI
		---help---
		Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx
		compliant Gigabit Ethernet Adapter. The following adapters are supported
		by this driver:
		compliant Gigabit Ethernet Adapter.

		This driver supports the original Yukon chipset. A cleaner driver is
		also available (skge) which seems to work better than this one.

		This driver does not support the newer Yukon2 chipset. A seperate
		driver, sky2, is provided to support Yukon2-based adapters.

		The following adapters are supported by this driver:
		- 3Com 3C940 Gigabit LOM Ethernet Adapter
		- 3Com 3C941 Gigabit LOM Ethernet Adapter
		- Allied Telesyn AT-2970LX Gigabit Ethernet Adapter

drivers/net/acenic.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1002,6 +1002,8 @@ static int __devinit ace_init(struct net_device *dev)

		mac1 = 0;
		for(i = 0; i < 4; i++) {
		int tmp;

		mac1 = mac1 << 8;
		tmp = read_eeprom_byte(dev, 0x8c+i);
		if (tmp < 0) {
		@@ -1012,6 +1014,8 @@ static int __devinit ace_init(struct net_device *dev)
		}
		mac2 = 0;
		for(i = 4; i < 8; i++) {
		int tmp;

		mac2 = mac2 << 8;
		tmp = read_eeprom_byte(dev, 0x8c+i);
		if (tmp < 0) {

drivers/net/b44.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1399,7 +1399,6 @@ static int b44_open(struct net_device *dev)
		b44_init_rings(bp);
		b44_init_hw(bp);

		netif_carrier_off(dev);
		b44_check_phy(bp);

		err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
		@@ -1464,7 +1463,7 @@ static int b44_close(struct net_device *dev)
		#endif
		b44_halt(bp);
		b44_free_rings(bp);
		netif_carrier_off(bp->dev);
		netif_carrier_off(dev);

		spin_unlock_irq(&bp->lock);

		@@ -2000,6 +1999,8 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
		dev->irq = pdev->irq;
		SET_ETHTOOL_OPS(dev, &b44_ethtool_ops);

		netif_carrier_off(dev);

		err = b44_get_invariants(bp);
		if (err) {
		printk(KERN_ERR PFX "Problem fetching invariants of chip, "

drivers/net/bonding/bond_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -576,7 +576,7 @@ static int bond_update_speed_duplex(struct slave *slave)
		slave->duplex = DUPLEX_FULL;

		if (slave_dev->ethtool_ops) {
		u32 res;
		int res;

		if (!slave_dev->ethtool_ops->get_settings) {
		return -1;

Admin message