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

Commit 48683d72 authored by Michael Ellerman's avatar Michael Ellerman Committed by Jeff Garzik
Browse files

[PATCH] iseries_veth: Remove TX timeout code 



The iseries_veth driver uses the generic TX timeout watchdog, however a better
solution is in the works, so remove this code.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent f0c129ca

drivers/net/iseries_veth.c

+0 −48
Original line number Original line Diff line number Diff line
@@ -830,49 +830,6 @@ static struct ethtool_ops ops = { 
	.get_link = veth_get_link,

	.get_link = veth_get_link,

};

};





static void veth_tx_timeout(struct net_device *dev)

{

	struct veth_port *port = (struct veth_port *)dev->priv;

	struct net_device_stats *stats = &port->stats;

	unsigned long flags;

	int i;



	stats->tx_errors++;



	spin_lock_irqsave(&port->pending_gate, flags);



	if (!port->pending_lpmask) {

		spin_unlock_irqrestore(&port->pending_gate, flags);

		return;

	}



	printk(KERN_WARNING "%s: Tx timeout!  Resetting lp connections: %08x\n",

	       dev->name, port->pending_lpmask);



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

		struct veth_lpar_connection *cnx = veth_cnx[i];



		if (! (port->pending_lpmask & (1<<i)))

			continue;



		/* If we're pending on it, we must be connected to it,

		 * so we should certainly have a structure for it. */

		BUG_ON(! cnx);



		/* Theoretically we could be kicking a connection

		 * which doesn't deserve it, but in practice if we've

		 * had a Tx timeout, the pending_lpmask will have

		 * exactly one bit set - the connection causing the

		 * problem. */

		spin_lock(&cnx->lock);

		cnx->state |= VETH_STATE_RESET;

		veth_kick_statemachine(cnx);

		spin_unlock(&cnx->lock);

	}



	spin_unlock_irqrestore(&port->pending_gate, flags);

}



static struct net_device * __init veth_probe_one(int vlan, struct device *vdev)

static struct net_device * __init veth_probe_one(int vlan, struct device *vdev)

{

{

	struct net_device *dev;

	struct net_device *dev;
@@ -921,9 +878,6 @@ static struct net_device * __init veth_probe_one(int vlan, struct device *vdev) 
	dev->set_multicast_list = veth_set_multicast_list;

	dev->set_multicast_list = veth_set_multicast_list;

	SET_ETHTOOL_OPS(dev, &ops);

	SET_ETHTOOL_OPS(dev, &ops);





	dev->watchdog_timeo = 2 * (VETH_ACKTIMEOUT * HZ / 1000000);

	dev->tx_timeout = veth_tx_timeout;



	SET_NETDEV_DEV(dev, vdev);

	SET_NETDEV_DEV(dev, vdev);





	rc = register_netdev(dev);

	rc = register_netdev(dev);
@@ -1058,8 +1012,6 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev) 




	lpmask = veth_transmit_to_many(skb, lpmask, dev);

	lpmask = veth_transmit_to_many(skb, lpmask, dev);





	dev->trans_start = jiffies;



	if (! lpmask) {

	if (! lpmask) {

		dev_kfree_skb(skb);

		dev_kfree_skb(skb);

	} else {

	} else {