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

Commit 4e4804be authored Dec 31, 2014 by David S. Miller

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2014-12-31

This series contains updates to fixes for e100, igb and i40e.

John Linville fixes a typo in e100 that has been around for some time,
where an attempted revert actually inverted the test for eeprom_mdix_enabled.

Todd fixes up a code comment that should have been removed back in 2007.

Joe Perches fixes a possible memory leak in i40e which was reported by
Dan Carpenter using smatch.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 2c90331c e3fe44c7

drivers/net/ethernet/intel/e100.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1543,7 +1543,7 @@ static int e100_phy_init(struct nic *nic)
	mdio_write(netdev, nic->mii.phy_id, MII_BMCR, bmcr);		mdio_write(netdev, nic->mii.phy_id, MII_BMCR, bmcr);
	} else if ((nic->mac >= mac_82550_D102) \|\| ((nic->flags & ich) &&		} else if ((nic->mac >= mac_82550_D102) \|\| ((nic->flags & ich) &&
	(mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000) &&		(mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000) &&
	!(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) {		(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) {
	/* enable/disable MDI/MDI-X auto-switching. */		/* enable/disable MDI/MDI-X auto-switching. */
	mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG,		mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG,
	nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH);		nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH);

drivers/net/ethernet/intel/i40e/i40e_debugfs.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -829,7 +829,7 @@ static void i40e_dbg_dump_desc(int cnt, int vsi_seid, int ring_id, int desc_n,
	if (desc_n >= ring->count \|\| desc_n < 0) {		if (desc_n >= ring->count \|\| desc_n < 0) {
	dev_info(&pf->pdev->dev,		dev_info(&pf->pdev->dev,
	"descriptor %d not found\n", desc_n);		"descriptor %d not found\n", desc_n);
	return;		goto out;
	}		}
	if (!is_rx_ring) {		if (!is_rx_ring) {
	txd = I40E_TX_DESC(ring, desc_n);		txd = I40E_TX_DESC(ring, desc_n);
	@@ -855,6 +855,8 @@ static void i40e_dbg_dump_desc(int cnt, int vsi_seid, int ring_id, int desc_n,
	} else {		} else {
	dev_info(&pf->pdev->dev, "dump desc rx/tx <vsi_seid> <ring_id> [<desc_n>]\n");		dev_info(&pf->pdev->dev, "dump desc rx/tx <vsi_seid> <ring_id> [<desc_n>]\n");
	}		}

			out:
	kfree(ring);		kfree(ring);
	}		}

drivers/net/ethernet/intel/igb/e1000_82575.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1125,7 +1125,7 @@ static s32 igb_acquire_swfw_sync_82575(struct e1000_hw *hw, u16 mask)
	u32 swmask = mask;		u32 swmask = mask;
	u32 fwmask = mask << 16;		u32 fwmask = mask << 16;
	s32 ret_val = 0;		s32 ret_val = 0;
	s32 i = 0, timeout = 200; /* FIXME: find real value to use here */		s32 i = 0, timeout = 200;

	while (i < timeout) {		while (i < timeout) {
	if (igb_get_hw_semaphore(hw)) {		if (igb_get_hw_semaphore(hw)) {