Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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>
+2
-10
drivers/firewire/net.c
+2
-10
drivers/firewire/net.c
···
1328
return NETDEV_TX_OK;
1329
}
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
static int fwnet_change_mtu(struct net_device *net, int new_mtu)
1339
{
1340
if (new_mtu < 68)
···
1352
.ndo_open = fwnet_open,
1353
.ndo_stop = fwnet_stop,
1354
.ndo_start_xmit = fwnet_tx,
1355
-
.ndo_tx_timeout = fwnet_tx_timeout,
1356
.ndo_change_mtu = fwnet_change_mtu,
1357
};
1358
···
1359
{
1360
net->header_ops = &fwnet_header_ops;
1361
net->netdev_ops = &fwnet_netdev_ops;
1362
-
net->watchdog_timeo = 100000; /* ? FIXME */
1363
net->flags = IFF_BROADCAST | IFF_MULTICAST;
1364
net->features = NETIF_F_HIGHDMA;
1365
net->addr_len = FWNET_ALEN;
1366
net->hard_header_len = FWNET_HLEN;
1367
net->type = ARPHRD_IEEE1394;
1368
-
net->tx_queue_len = 1000; /* ? FIXME */
1369
SET_ETHTOOL_OPS(net, &fwnet_ethtool_ops);
1370
}
1371
···
1328
return NETDEV_TX_OK;
1329
}
1330
1331
static int fwnet_change_mtu(struct net_device *net, int new_mtu)
1332
{
1333
if (new_mtu < 68)
···
1359
.ndo_open = fwnet_open,
1360
.ndo_stop = fwnet_stop,
1361
.ndo_start_xmit = fwnet_tx,
1362
.ndo_change_mtu = fwnet_change_mtu,
1363
};
1364
···
1367
{
1368
net->header_ops = &fwnet_header_ops;
1369
net->netdev_ops = &fwnet_netdev_ops;
1370
+
net->watchdog_timeo = 2 * HZ;
1371
net->flags = IFF_BROADCAST | IFF_MULTICAST;
1372
net->features = NETIF_F_HIGHDMA;
1373
net->addr_len = FWNET_ALEN;
1374
net->hard_header_len = FWNET_HLEN;
1375
net->type = ARPHRD_IEEE1394;
1376
+
net->tx_queue_len = 10;
1377
SET_ETHTOOL_OPS(net, &fwnet_ethtool_ops);
1378
}
1379