Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61edab8d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  phylib: Silence driver registration
  phylib: Add ID for Marvell 88E1240
  82596: free nonexistent resource fix
  SUNHME: Fix missing NETIF_F_VLAN_CHALLENGED on PCI happy meals
parents 2655e2ce f2511f13

drivers/net/82596.c

+2 −1
Original line number Diff line number Diff line
@@ -1192,6 +1192,8 @@ struct net_device * __init i82596_probe(int unit) 
			goto out;

		}



		dev->base_addr = ioaddr;



		for (i = 0; i < 8; i++) {

			eth_addr[i] = inb(ioaddr + 8 + i);

			checksum += eth_addr[i];
@@ -1209,7 +1211,6 @@ struct net_device * __init i82596_probe(int unit) 
			goto out1;

		}



		dev->base_addr = ioaddr;

		dev->irq = 10;

	}

#endif

drivers/net/phy/marvell.c

+18 −5
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static struct phy_driver marvell_drivers[] = { 
		.read_status = &genphy_read_status,

		.ack_interrupt = &marvell_ack_interrupt,

		.config_intr = &marvell_config_intr,

		.driver = {.owner = THIS_MODULE,},

		.driver = { .owner = THIS_MODULE },

	},

	{

		.phy_id = 0x01410c90,
@@ -278,7 +278,7 @@ static struct phy_driver marvell_drivers[] = { 
		.read_status = &genphy_read_status,

		.ack_interrupt = &marvell_ack_interrupt,

		.config_intr = &marvell_config_intr,

		.driver = {.owner = THIS_MODULE,},

		.driver = { .owner = THIS_MODULE },

	},

	{

		.phy_id = 0x01410cc0,
@@ -291,7 +291,7 @@ static struct phy_driver marvell_drivers[] = { 
		.read_status = &genphy_read_status,

		.ack_interrupt = &marvell_ack_interrupt,

		.config_intr = &marvell_config_intr,

		.driver = {.owner = THIS_MODULE,},

		.driver = { .owner = THIS_MODULE },

	},

	{

		.phy_id = 0x01410cd0,
@@ -304,8 +304,21 @@ static struct phy_driver marvell_drivers[] = { 
		.read_status = &genphy_read_status,

		.ack_interrupt = &marvell_ack_interrupt,

		.config_intr = &marvell_config_intr,

		.driver = {.owner = THIS_MODULE,},

	}

		.driver = { .owner = THIS_MODULE },

	},

	{

		.phy_id = 0x01410e30,

		.phy_id_mask = 0xfffffff0,

		.name = "Marvell 88E1240",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.config_init = &m88e1111_config_init,

		.config_aneg = &marvell_config_aneg,

		.read_status = &genphy_read_status,

		.ack_interrupt = &marvell_ack_interrupt,

		.config_intr = &marvell_config_intr,

		.driver = { .owner = THIS_MODULE },

	},

};



static int __init marvell_init(void)

drivers/net/phy/phy_device.c

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ int phy_driver_register(struct phy_driver *new_driver) 
		return retval;

	}



	pr_info("%s: Registered new driver\n", new_driver->name);

	pr_debug("%s: Registered new driver\n", new_driver->name);



	return 0;

}

drivers/net/sunhme.c

+2 −2
Original line number Diff line number Diff line
@@ -3143,8 +3143,8 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, 
	dev->irq = pdev->irq;

	dev->dma = 0;



	/* Happy Meal can do it all... */

	dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;

	/* Happy Meal can do it all... except VLAN. */

	dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_VLAN_CHALLENGED;



#if defined(CONFIG_SBUS) && defined(CONFIG_PCI)

	/* Hook up PCI register/dma accessors. */