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

Commit 21a180cd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:
	net/ipv4/Kconfig
	net/ipv4/tcp_timer.c
parents c7d4426a 51e97a12

arch/um/drivers/net_kern.c

+3 −14
Original line number Diff line number Diff line
@@ -255,18 +255,6 @@ static void uml_net_tx_timeout(struct net_device *dev) 
	netif_wake_queue(dev);

}



static int uml_net_set_mac(struct net_device *dev, void *addr)

{

	struct uml_net_private *lp = netdev_priv(dev);

	struct sockaddr *hwaddr = addr;



	spin_lock_irq(&lp->lock);

	eth_mac_addr(dev, hwaddr->sa_data);

	spin_unlock_irq(&lp->lock);



	return 0;

}



static int uml_net_change_mtu(struct net_device *dev, int new_mtu)

{

	dev->mtu = new_mtu;
@@ -373,7 +361,7 @@ static const struct net_device_ops uml_netdev_ops = { 
	.ndo_start_xmit 	= uml_net_start_xmit,

	.ndo_set_multicast_list = uml_net_set_multicast_list,

	.ndo_tx_timeout 	= uml_net_tx_timeout,

	.ndo_set_mac_address	= uml_net_set_mac,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_change_mtu 	= uml_net_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

};
@@ -472,7 +460,8 @@ static void eth_configure(int n, void *init, char *mac, 
	    ((*transport->user->init)(&lp->user, dev) != 0))

		goto out_unregister;



	eth_mac_addr(dev, device->mac);

	/* don't use eth_mac_addr, it will not work here */

	memcpy(dev->dev_addr, device->mac, ETH_ALEN);

	dev->mtu = transport->user->mtu;

	dev->netdev_ops = &uml_netdev_ops;

	dev->ethtool_ops = &uml_net_ethtool_ops;

drivers/net/3c59x.c

+10 −0
Original line number Diff line number Diff line
@@ -2942,6 +2942,9 @@ static void vortex_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
{

	struct vortex_private *vp = netdev_priv(dev);



	if (!VORTEX_PCI(vp))

		return;



	wol->supported = WAKE_MAGIC;



	wol->wolopts = 0;
@@ -2952,6 +2955,10 @@ static void vortex_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
static int vortex_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)

{

	struct vortex_private *vp = netdev_priv(dev);



	if (!VORTEX_PCI(vp))

		return -EOPNOTSUPP;



	if (wol->wolopts & ~WAKE_MAGIC)

		return -EINVAL;
@@ -3201,6 +3208,9 @@ static void acpi_set_WOL(struct net_device *dev) 
			return;

		}



		if (VORTEX_PCI(vp)->current_state < PCI_D3hot)

			return;



		/* Change the power state to D3; RxEnable doesn't take effect. */

		pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot);

	}

drivers/net/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -2428,7 +2428,7 @@ config UGETH_TX_ON_DEMAND 


config MV643XX_ETH

	tristate "Marvell Discovery (643XX) and Orion ethernet support"

	depends on MV64X60 || PPC32 || PLAT_ORION

	depends on (MV64X60 || PPC32 || PLAT_ORION) && INET

	select INET_LRO

	select PHYLIB

	help
@@ -2815,7 +2815,7 @@ config NIU 


config PASEMI_MAC

	tristate "PA Semi 1/10Gbit MAC"

	depends on PPC_PASEMI && PCI

	depends on PPC_PASEMI && PCI && INET

	select PHYLIB

	select INET_LRO

	help

drivers/net/tulip/de2104x.c

+5 −2
Original line number Diff line number Diff line
@@ -364,9 +364,9 @@ static u16 t21040_csr15[] = { 0, 0, 0x0006, 0x0000, 0x0000, }; 


/* 21041 transceiver register settings: TP AUTO, BNC, AUI, TP, TP FD*/

static u16 t21041_csr13[] = { 0xEF01, 0xEF09, 0xEF09, 0xEF01, 0xEF09, };

static u16 t21041_csr14[] = { 0xFFFF, 0xF7FD, 0xF7FD, 0x6F3F, 0x6F3D, };

static u16 t21041_csr14[] = { 0xFFFF, 0xF7FD, 0xF7FD, 0x7F3F, 0x7F3D, };

/* If on-chip autonegotiation is broken, use half-duplex (FF3F) instead */

static u16 t21041_csr14_brk[] = { 0xFF3F, 0xF7FD, 0xF7FD, 0x6F3F, 0x6F3D, };

static u16 t21041_csr14_brk[] = { 0xFF3F, 0xF7FD, 0xF7FD, 0x7F3F, 0x7F3D, };

static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
@@ -1597,12 +1597,15 @@ static int __de_set_settings(struct de_private *de, struct ethtool_cmd *ecmd) 
		return 0; /* nothing to change */



	de_link_down(de);

	mod_timer(&de->media_timer, jiffies + DE_TIMER_NO_LINK);

	de_stop_rxtx(de);



	de->media_type = new_media;

	de->media_lock = media_lock;

	de->media_advertise = ecmd->advertising;

	de_set_media(de);

	if (netif_running(de->dev))

		de_start_rxtx(de);



	return 0;

}

drivers/vhost/vhost.c

+4 −3
Original line number Diff line number Diff line
@@ -858,11 +858,12 @@ int vhost_log_write(struct vhost_virtqueue *vq, struct vhost_log *log, 
		if (r < 0)

			return r;

		len -= l;

		if (!len)

			return 0;

	}

		if (!len) {

			if (vq->log_ctx)

				eventfd_signal(vq->log_ctx, 1);

			return 0;

		}

	}

	/* Length written exceeds what we have stored. This is a bug. */

	BUG();

	return 0;