aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2009-06-14 05:47:44 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2009-06-14 08:26:29 -0400
commit1337f8535ac1f41915d9e8aa03d5a3edf2f7c0a5 (patch)
tree87e11b5184d1a5df659d90fb4cd48183043b247f
parent156ce867a6725ea8a24b452469a6dc9f3fa6a161 (diff)
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>
-rw-r--r--drivers/firewire/net.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index d67e8d957d21..95e35a36b01f 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1328,13 +1328,6 @@ static int fwnet_tx(struct sk_buff *skb, struct net_device *net)
1328 return NETDEV_TX_OK; 1328 return NETDEV_TX_OK;
1329} 1329}
1330 1330
1331static 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
1338static int fwnet_change_mtu(struct net_device *net, int new_mtu) 1331static int fwnet_change_mtu(struct net_device *net, int new_mtu)
1339{ 1332{
1340 if (new_mtu < 68) 1333 if (new_mtu < 68)
@@ -1359,7 +1352,6 @@ static const struct net_device_ops fwnet_netdev_ops = {
1359 .ndo_open = fwnet_open, 1352 .ndo_open = fwnet_open,
1360 .ndo_stop = fwnet_stop, 1353 .ndo_stop = fwnet_stop,
1361 .ndo_start_xmit = fwnet_tx, 1354 .ndo_start_xmit = fwnet_tx,
1362 .ndo_tx_timeout = fwnet_tx_timeout,
1363 .ndo_change_mtu = fwnet_change_mtu, 1355 .ndo_change_mtu = fwnet_change_mtu,
1364}; 1356};
1365 1357
@@ -1367,13 +1359,13 @@ static void fwnet_init_dev(struct net_device *net)
1367{ 1359{
1368 net->header_ops = &fwnet_header_ops; 1360 net->header_ops = &fwnet_header_ops;
1369 net->netdev_ops = &fwnet_netdev_ops; 1361 net->netdev_ops = &fwnet_netdev_ops;
1370 net->watchdog_timeo = 100000; /* ? FIXME */ 1362 net->watchdog_timeo = 2 * HZ;
1371 net->flags = IFF_BROADCAST | IFF_MULTICAST; 1363 net->flags = IFF_BROADCAST | IFF_MULTICAST;
1372 net->features = NETIF_F_HIGHDMA; 1364 net->features = NETIF_F_HIGHDMA;
1373 net->addr_len = FWNET_ALEN; 1365 net->addr_len = FWNET_ALEN;
1374 net->hard_header_len = FWNET_HLEN; 1366 net->hard_header_len = FWNET_HLEN;
1375 net->type = ARPHRD_IEEE1394; 1367 net->type = ARPHRD_IEEE1394;
1376 net->tx_queue_len = 1000; /* ? FIXME */ 1368 net->tx_queue_len = 10;
1377 SET_ETHTOOL_OPS(net, &fwnet_ethtool_ops); 1369 SET_ETHTOOL_OPS(net, &fwnet_ethtool_ops);
1378} 1370}
1379 1371