.. | .. |
---|
288 | 288 | */ |
---|
289 | 289 | static netdev_tx_t do_start_xmit(struct sk_buff *skb, |
---|
290 | 290 | struct net_device *dev); |
---|
291 | | -static void xirc_tx_timeout(struct net_device *dev); |
---|
| 291 | +static void xirc_tx_timeout(struct net_device *dev, unsigned int txqueue); |
---|
292 | 292 | static void xirc2ps_tx_timeout_task(struct work_struct *work); |
---|
293 | 293 | static void set_addresses(struct net_device *dev); |
---|
294 | 294 | static void set_multicast_list(struct net_device *dev); |
---|
.. | .. |
---|
1203 | 1203 | } |
---|
1204 | 1204 | |
---|
1205 | 1205 | static void |
---|
1206 | | -xirc_tx_timeout(struct net_device *dev) |
---|
| 1206 | +xirc_tx_timeout(struct net_device *dev, unsigned int txqueue) |
---|
1207 | 1207 | { |
---|
1208 | 1208 | struct local_info *lp = netdev_priv(dev); |
---|
1209 | 1209 | dev->stats.tx_errors++; |
---|
.. | .. |
---|
1434 | 1434 | switch(cmd) { |
---|
1435 | 1435 | case SIOCGMIIPHY: /* Get the address of the PHY in use. */ |
---|
1436 | 1436 | data->phy_id = 0; /* we have only this address */ |
---|
1437 | | - /* fall through */ |
---|
| 1437 | + fallthrough; |
---|
1438 | 1438 | case SIOCGMIIREG: /* Read the specified MII register. */ |
---|
1439 | 1439 | data->val_out = mii_rd(ioaddr, data->phy_id & 0x1f, |
---|
1440 | 1440 | data->reg_num & 0x1f); |
---|
.. | .. |
---|
1473 | 1473 | unsigned int ioaddr = dev->base_addr; |
---|
1474 | 1474 | unsigned value; |
---|
1475 | 1475 | |
---|
1476 | | - pr_debug("%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full); |
---|
| 1476 | + pr_debug("%s: do_reset(%p,%d)\n", dev->name, dev, full); |
---|
1477 | 1477 | |
---|
1478 | 1478 | hardreset(dev); |
---|
1479 | 1479 | PutByte(XIRCREG_CR, SoftReset); /* set */ |
---|