Commit c4e7ac5d 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:
  e1000: Add device IDs of new 82571 board variants
  xen-netfront: Avoid deref'ing skbafter it is potentially freed.
  3c59x maintainer
  3c59x: fix duplex configuration
  natsemi: fix netdev error acounting
  ax88796 printk fixes
  myri10ge: Use the pause counter to avoid a needless device reset
  via-rhine: disable rx_copybreak on archs that don't allow unaligned DMA access
parents c019b193 ce57a02c

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -97,6 +97,12 @@ M: philb@gnu.org 
L:	netdev@vger.kernel.org

S:	Maintained



3C59X NETWORK DRIVER

P:	Steffen Klassert

M:	klassert@mathematik.tu-chemnitz.de

L:	netdev@vger.kernel.org

S:	Maintained



3CR990 NETWORK DRIVER

P:	David Dillow

M:	dave@thedillows.org

drivers/net/3c59x.c

+1 −0
Original line number Diff line number Diff line
@@ -1555,6 +1555,7 @@ vortex_up(struct net_device *dev) 
		mii_reg1 = mdio_read(dev, vp->phys[0], MII_BMSR);

		mii_reg5 = mdio_read(dev, vp->phys[0], MII_LPA);

		vp->partner_flow_ctrl = ((mii_reg5 & 0x0400) != 0);

		vp->mii.full_duplex = vp->full_duplex;



		vortex_check_media(dev, 1);

	}

drivers/net/ax88796.c

+3 −2
Original line number Diff line number Diff line
@@ -821,8 +821,9 @@ static int ax_probe(struct platform_device *pdev) 
	dev->base_addr = (unsigned long)ei_status.mem;



	if (ei_status.mem == NULL) {

		dev_err(&pdev->dev, "Cannot ioremap area (%08zx,%08zx)\n",

			res->start, res->end);

		dev_err(&pdev->dev, "Cannot ioremap area (%08llx,%08llx)\n",

			(unsigned long long)res->start,

			(unsigned long long)res->end);



 		ret = -ENXIO;

		goto exit_req;

drivers/net/e1000/e1000_ethtool.c

+2 −0
Original line number Diff line number Diff line
@@ -1706,6 +1706,7 @@ static int e1000_wol_exclusion(struct e1000_adapter *adapter, struct ethtool_wol 
	case E1000_DEV_ID_82545EM_COPPER:

	case E1000_DEV_ID_82546GB_QUAD_COPPER:

	case E1000_DEV_ID_82546GB_PCIE:

	case E1000_DEV_ID_82571EB_SERDES_QUAD:

		/* these don't support WoL at all */

		wol->supported = 0;

		break;
@@ -1723,6 +1724,7 @@ static int e1000_wol_exclusion(struct e1000_adapter *adapter, struct ethtool_wol 
		retval = 0;

		break;

	case E1000_DEV_ID_82571EB_QUAD_COPPER:

	case E1000_DEV_ID_82571EB_QUAD_FIBER:

	case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:

	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:

		/* quad port adapters only support WoL on port A */

drivers/net/e1000/e1000_hw.c

+5 −0
Original line number Diff line number Diff line
@@ -384,7 +384,10 @@ e1000_set_mac_type(struct e1000_hw *hw) 
	case E1000_DEV_ID_82571EB_COPPER:

	case E1000_DEV_ID_82571EB_FIBER:

	case E1000_DEV_ID_82571EB_SERDES:

	case E1000_DEV_ID_82571EB_SERDES_DUAL:

	case E1000_DEV_ID_82571EB_SERDES_QUAD:

	case E1000_DEV_ID_82571EB_QUAD_COPPER:

	case E1000_DEV_ID_82571EB_QUAD_FIBER:

	case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:

		hw->mac_type = e1000_82571;

		break;
@@ -485,6 +488,8 @@ e1000_set_media_type(struct e1000_hw *hw) 
    case E1000_DEV_ID_82545GM_SERDES:

    case E1000_DEV_ID_82546GB_SERDES:

    case E1000_DEV_ID_82571EB_SERDES:

    case E1000_DEV_ID_82571EB_SERDES_DUAL:

    case E1000_DEV_ID_82571EB_SERDES_QUAD:

    case E1000_DEV_ID_82572EI_SERDES:

    case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:

        hw->media_type = e1000_media_type_internal_serdes;

CRA Git | Maintained and supported by SUSTech CRA and CCSE