diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-08-24 18:53:27 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-08-24 18:53:27 +0000 |
| commit | 167120730bed3bcfdc7585db3f0d4a191481d15d (patch) | |
| tree | ce432decb7bc41fe857f68bc43e5408b0ef93cbc /target/linux/ar71xx | |
| parent | d2693b8b60c0d2fcef19185128433c181ee6e130 (diff) | |
| download | upstream-167120730bed3bcfdc7585db3f0d4a191481d15d.tar.gz upstream-167120730bed3bcfdc7585db3f0d4a191481d15d.tar.bz2 upstream-167120730bed3bcfdc7585db3f0d4a191481d15d.zip | |
initialize ndo_tx_timeout field of netdev_ops
SVN-Revision: 17363
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-netdev-ops.patch | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-netdev-ops.patch b/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-netdev-ops.patch index 2fc7f84bf0..a692b734aa 100644 --- a/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-netdev-ops.patch +++ b/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-netdev-ops.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ag71xx/ag71xx_main.c +++ b/drivers/net/ag71xx/ag71xx_main.c -@@ -791,6 +791,17 @@ static void ag71xx_set_multicast_list(st +@@ -791,6 +791,18 @@ static void ag71xx_set_multicast_list(st /* TODO */ } @@ -10,6 +10,7 @@ + .ndo_start_xmit = ag71xx_hard_start_xmit, + .ndo_set_multicast_list = ag71xx_set_multicast_list, + .ndo_do_ioctl = ag71xx_do_ioctl, ++ .ndo_tx_timeout = ag71xx_tx_timeout, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, @@ -18,7 +19,7 @@ static int __init ag71xx_probe(struct platform_device *pdev) { struct net_device *dev; -@@ -875,11 +886,7 @@ static int __init ag71xx_probe(struct pl +@@ -875,14 +887,9 @@ static int __init ag71xx_probe(struct pl } dev->base_addr = (unsigned long)ag->mac_base; @@ -30,4 +31,7 @@ + dev->netdev_ops = &ag71xx_netdev_ops; dev->ethtool_ops = &ag71xx_ethtool_ops; - dev->tx_timeout = ag71xx_tx_timeout; +- dev->tx_timeout = ag71xx_tx_timeout; + INIT_WORK(&ag->restart_work, ag71xx_restart_work_func); + + init_timer(&ag->oom_timer); |