diff options
| author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-04-14 15:18:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-14 15:18:00 -0700 |
| commit | 32e8f9a8d9bd52b59b512f8e5177b08e8edfd58b (patch) | |
| tree | a3398877b390b1d8913237da2d68d70824a6fdcc /drivers/net/ehea | |
| parent | d119b3927994e3d620d6adb0dd1ea6bf24427875 (diff) | |
| download | linux-32e8f9a8d9bd52b59b512f8e5177b08e8edfd58b.tar.gz linux-32e8f9a8d9bd52b59b512f8e5177b08e8edfd58b.tar.bz2 linux-32e8f9a8d9bd52b59b512f8e5177b08e8edfd58b.zip | |
ehea: Fix incomplete conversion to net_device_ops
Reported-by: Subrata Modak <subrata@linux.vnet.ibm.com>
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ehea')
| -rw-r--r-- | 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 ac0c5b438e0a..604c844d0769 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); |