Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1337f8535ac1f41915d9e8aa03d5a3edf2f7c0a5

Authored by Stefan Richter
1 parent 156ce867a6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

firewire: net: adjust net_device ops 

The .ndo_tx_timeout callback is currently without function; delete it.
Give .watchdog_timeo a proper time value; lower it to 2 seconds.

Decrease the .tx_queue_len from 1000 (as in Ethernet card drivers) to 10
because we have only 64 transaction labels available, and responders
might have further limits of their AR req contexts.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

Showing 1 changed file with 2 additions and 10 deletions Side-by-side Diff

drivers/firewire/net.c
Diff comments   View file @ 1337f85
... ... @@ -1328,13 +1328,6 @@
1328 1328 return NETDEV_TX_OK;
1329 1329 }
1330 1330  
1331   -static void fwnet_tx_timeout(struct net_device *net)
1332   -{
1333   - fw_error("%s: timeout\n", net->name);
1334   -
1335   - /* FIXME: What to do if we timeout? */
1336   -}
1337   -
1338 1331 static int fwnet_change_mtu(struct net_device *net, int new_mtu)
1339 1332 {
1340 1333 if (new_mtu < 68)
... ... @@ -1359,7 +1352,6 @@
1359 1352 .ndo_open = fwnet_open,
1360 1353 .ndo_stop = fwnet_stop,
1361 1354 .ndo_start_xmit = fwnet_tx,
1362   - .ndo_tx_timeout = fwnet_tx_timeout,
1363 1355 .ndo_change_mtu = fwnet_change_mtu,
1364 1356 };
1365 1357  
1366 1358  
... ... @@ -1367,13 +1359,13 @@
1367 1359 {
1368 1360 net->header_ops = &fwnet_header_ops;
1369 1361 net->netdev_ops = &fwnet_netdev_ops;
1370   - net->watchdog_timeo = 100000; /* ? FIXME */
  1362 + net->watchdog_timeo = 2 * HZ;
1371 1363 net->flags = IFF_BROADCAST | IFF_MULTICAST;
1372 1364 net->features = NETIF_F_HIGHDMA;
1373 1365 net->addr_len = FWNET_ALEN;
1374 1366 net->hard_header_len = FWNET_HLEN;
1375 1367 net->type = ARPHRD_IEEE1394;
1376   - net->tx_queue_len = 1000; /* ? FIXME */
  1368 + net->tx_queue_len = 10;
1377 1369 SET_ETHTOOL_OPS(net, &fwnet_ethtool_ops);
1378 1370 }
1379 1371