aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2005-05-12 03:53:18 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-15 18:08:05 -0400
commiteb235aef724568ae15af831968000cf9a3974b26 (patch)
treead6f5b503c26a81a734a436ceb2db9a933d8c9c2
parentf27eff1ffd65236b8e421188f76ad1b0b94e06eb (diff)
[PATCH] iseries_veth: Set dev->trans_start so watchdog timer works right
Hi Andrew, Jeff, The iseries_veth driver doesn't set dev->trans_start in it's TX path. This will cause the net device watchdog timer to fire earlier than we want it to, which causes the driver to needlessly reset its connections to other LPARs. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
-rw-r--r--drivers/net/iseries_veth.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 7d0ef2969b4e..1e869df656c1 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -1023,6 +1023,8 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev)
1023 1023
1024 lpmask = veth_transmit_to_many(skb, lpmask, dev); 1024 lpmask = veth_transmit_to_many(skb, lpmask, dev);
1025 1025
1026 dev->trans_start = jiffies;
1027
1026 if (! lpmask) { 1028 if (! lpmask) {
1027 dev_kfree_skb(skb); 1029 dev_kfree_skb(skb);
1028 } else { 1030 } else {