.. | .. |
---|
118 | 118 | int auto_select; /* cable-selection by carrier */ |
---|
119 | 119 | unsigned short busmaster_regval; |
---|
120 | 120 | |
---|
121 | | -#ifdef CONFIG_SUNLANCE |
---|
122 | | - struct Linux_SBus_DMA *ledma; /* if set this points to ledma and arch=4m */ |
---|
123 | | - int burst_sizes; /* ledma SBus burst sizes */ |
---|
124 | | -#endif |
---|
125 | 121 | struct timer_list multicast_timer; |
---|
126 | 122 | struct net_device *dev; |
---|
127 | 123 | }; |
---|
.. | .. |
---|
522 | 518 | return status; |
---|
523 | 519 | } |
---|
524 | 520 | |
---|
525 | | -static void lance_tx_timeout(struct net_device *dev) |
---|
| 521 | +static void lance_tx_timeout(struct net_device *dev, unsigned int txqueue) |
---|
526 | 522 | { |
---|
527 | 523 | struct lance_private *lp = netdev_priv(dev); |
---|
528 | 524 | volatile struct lance_regs *ll = lp->ll; |
---|
.. | .. |
---|
551 | 547 | if (!lance_tx_buffs_avail(lp)) |
---|
552 | 548 | goto out_free; |
---|
553 | 549 | |
---|
554 | | -#ifdef DEBUG |
---|
555 | 550 | /* dump the packet */ |
---|
556 | | - print_hex_dump(KERN_DEBUG, "skb->data: ", DUMP_PREFIX_NONE, |
---|
557 | | - 16, 1, skb->data, 64, true); |
---|
558 | | -#endif |
---|
| 551 | + print_hex_dump_debug("skb->data: ", DUMP_PREFIX_NONE, 16, 1, skb->data, |
---|
| 552 | + 64, true); |
---|
| 553 | + |
---|
559 | 554 | entry = lp->tx_new & lp->tx_ring_mod_mask; |
---|
560 | 555 | ib->btx_ring[entry].length = (-skblen) | 0xf000; |
---|
561 | 556 | ib->btx_ring[entry].misc = 0; |
---|