From 4a231ab4cbd85312db3f09af1fac0b1d6f99a6d1 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Tue, 14 Apr 2009 15:18:00 -0700
Subject: [PATCH] --- yaml --- r: 143455 b: refs/heads/master c:
 32e8f9a8d9bd52b59b512f8e5177b08e8edfd58b h: refs/heads/master i:   143453:
 7359139283b64e828f927feba1efa430a955f8f0   143451:
 f66e7acda44b259311ccd6f64b32b4a1a979a3de   143447:
 845b1868305b9280eb90ff8ebcf05271c3e08146   143439:
 d7b9548e2de80c36b772dd3888ae27b150fd72c6   143423:
 c732cb3b2fd22fc73cd7e9608027fa7fe7995146 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/ehea/ehea_main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dc93a65532d7..dc0f8a17f7cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d119b3927994e3d620d6adb0dd1ea6bf24427875
+refs/heads/master: 32e8f9a8d9bd52b59b512f8e5177b08e8edfd58b
diff --git a/trunk/drivers/net/ehea/ehea_main.c b/trunk/drivers/net/ehea/ehea_main.c
index ac0c5b438e0a..604c844d0769 100644
--- a/trunk/drivers/net/ehea/ehea_main.c
+++ b/trunk/drivers/net/ehea/ehea_main.c
@@ -3080,7 +3080,8 @@ static const struct net_device_ops ehea_netdev_ops = {
 	.ndo_change_mtu		= ehea_change_mtu,
 	.ndo_vlan_rx_register	= ehea_vlan_rx_register,
 	.ndo_vlan_rx_add_vid	= ehea_vlan_rx_add_vid,
-	.ndo_vlan_rx_kill_vid	= ehea_vlan_rx_kill_vid
+	.ndo_vlan_rx_kill_vid	= ehea_vlan_rx_kill_vid,
+	.ndo_tx_timeout		= ehea_tx_watchdog,
 };
 
 struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
@@ -3142,7 +3143,6 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
 		      | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX
 		      | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER
 		      | NETIF_F_LLTX;
-	dev->tx_timeout = &ehea_tx_watchdog;
 	dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;
 
 	INIT_WORK(&port->reset_task, ehea_reset_port);