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

Commit 7437e7d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  FEC: Fix kernel panic in fec_set_mac_address.
  ipv6: Fix default multicast hops setting.
  net: ep93xx_eth stops receiving packets
  drivers/net/phy: micrel phy driver
  dm9601: fix phy/eeprom write routine
  ppp_generic: handle non-linear skbs when passing them to pppd
  ppp_generic: pull 2 bytes so that PPP_PROTO(skb) is valid
  net: fix compile error due to double return type in SOCK_DEBUG
  net/usb: initiate sync sequence in sierra_net.c driver
  net/usb: remove default in Kconfig for sierra_net driver
  r8169: Fix rtl8169_rx_interrupt()
  e1000e: Fix oops caused by ASPM patch.
  net/sb1250: register mdio bus in probe
  sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4)
  p54pci: fix bugs in p54p_check_tx_ring
parents 38c9e91b 7cff0943

drivers/net/arm/ep93xx_eth.c

+5 −5
Original line number Diff line number Diff line
@@ -311,11 +311,6 @@ err: 
		processed++;

	}



	if (processed) {

		wrw(ep, REG_RXDENQ, processed);

		wrw(ep, REG_RXSTSENQ, processed);

	}



	return processed;

}
@@ -350,6 +345,11 @@ poll_some_more: 
			goto poll_some_more;

	}



	if (rx) {

		wrw(ep, REG_RXDENQ, rx);

		wrw(ep, REG_RXSTSENQ, rx);

	}



	return rx;

}

drivers/net/e1000e/netdev.c

+3 −0
Original line number Diff line number Diff line
@@ -4633,6 +4633,9 @@ static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state) 
	reg16 &= ~state;

	pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16);



	if (!pdev->bus->self)

		return;



	pos = pci_pcie_cap(pdev->bus->self);

	pci_read_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, &reg16);

	reg16 &= ~state;

drivers/net/fec.c

+1 −1
Original line number Diff line number Diff line
@@ -1653,7 +1653,7 @@ fec_set_mac_address(struct net_device *dev, void *p) 
		(dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24),

		fep->hwp + FEC_ADDR_LOW);

	writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24),

		fep + FEC_ADDR_HIGH);

		fep->hwp + FEC_ADDR_HIGH);

	return 0;

}

drivers/net/phy/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ config LSI_ET1011C_PHY 
	---help---

	  Supports the LSI ET1011C PHY.



config MICREL_PHY

	tristate "Driver for Micrel PHYs"

	---help---

	  Supports the KSZ9021, VSC8201, KS8001 PHYs.



config FIXED_PHY

	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"

	depends on PHYLIB=y

drivers/net/phy/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,4 +20,5 @@ obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o 
obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o

obj-$(CONFIG_NATIONAL_PHY)	+= national.o

obj-$(CONFIG_STE10XP)		+= ste10Xp.o

obj-$(CONFIG_MICREL_PHY)	+= micrel.o

obj-$(CONFIG_MDIO_OCTEON)	+= mdio-octeon.o