summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Leon2005-10-26 18:46:53 +0200
committerJeff Garzik2005-10-28 22:07:30 +0200
commit0abe791e94033b727f2b55670c2966f3d3d3cf70 (patch)
tree7fe7e9dffdcb5822537a5b03c7064667e05426e6
parent[PATCH] tg3: update version and minor fixes (diff)
downloadkernel-qcow2-linux-0abe791e94033b727f2b55670c2966f3d3d3cf70.tar.gz
kernel-qcow2-linux-0abe791e94033b727f2b55670c2966f3d3d3cf70.tar.xz
kernel-qcow2-linux-0abe791e94033b727f2b55670c2966f3d3d3cf70.zip
[PATCH] ibmveth fix bonding
This patch updates dev->trans_start and dev->last_rx so that the ibmveth driver can be used with the ARP monitor in the bonding driver. Signed-off-by: Santiago Leon <santil@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/net/ibmveth.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index a2c4dd4fb221..5617bec7fd53 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -725,6 +725,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
} else {
adapter->stats.tx_packets++;
adapter->stats.tx_bytes += skb->len;
+ netdev->trans_start = jiffies;
}
do {
@@ -776,6 +777,7 @@ static int ibmveth_poll(struct net_device *netdev, int *budget)
adapter->stats.rx_packets++;
adapter->stats.rx_bytes += length;
frames_processed++;
+ netdev->last_rx = jiffies;
}
} else {
more_work = 0;