Observed the following build error:
---
CC drivers/net/ehea/ehea_main.o
drivers/net/ehea/ehea_main.c: In function ‘ehea_setup_single_port’:
drivers/net/ehea/ehea_main.c:3145: error: ‘struct net_device’ has no
member named ‘tx_timeout’
make[3]: *** [drivers/net/ehea/ehea_main.o] Error 1
make[2]: *** [drivers/net/ehea] Error 2
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2
---
Regards--
Subrata
On Tue, Apr 14, 2009 at 11:59:07PM +0530, Subrata Modak wrote:
> Observed the following build error:
> CC drivers/net/ehea/ehea_main.o
> drivers/net/ehea/ehea_main.c: In function ???ehea_setup_single_port???:
> drivers/net/ehea/ehea_main.c:3145: error: ???struct net_device??? has no
> member named ???tx_timeout???
>From 56142fa2ed992aeee3f2635990ac37807379a310 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <[email protected]>
Date: Tue, 14 Apr 2009 22:35:32 +0400
Subject: [PATCH] ehea: Fix incomplete conversion to net_device_ops
Reported-by: Subrata Modak <[email protected]>
Signed-off-by: Alexander Beregalov <[email protected]>
---
drivers/net/ehea/ehea_main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index ac0c5b4..604c844 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/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);
--
1.6.2.3
From: Alexander Beregalov <[email protected]>
Date: Tue, 14 Apr 2009 22:39:38 +0400
> ehea: Fix incomplete conversion to net_device_ops
>
> Reported-by: Subrata Modak <[email protected]>
> Signed-off-by: Alexander Beregalov <[email protected]>
Applied, thanks Alexander.