hc
2024-05-10 23fa18eaa71266feff7ba8d83022d9e1cc83c65a
kernel/drivers/net/ethernet/amd/a2065.c
....@@ -118,10 +118,6 @@
118118 int auto_select; /* cable-selection by carrier */
119119 unsigned short busmaster_regval;
120120
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
125121 struct timer_list multicast_timer;
126122 struct net_device *dev;
127123 };
....@@ -522,7 +518,7 @@
522518 return status;
523519 }
524520
525
-static void lance_tx_timeout(struct net_device *dev)
521
+static void lance_tx_timeout(struct net_device *dev, unsigned int txqueue)
526522 {
527523 struct lance_private *lp = netdev_priv(dev);
528524 volatile struct lance_regs *ll = lp->ll;
....@@ -551,11 +547,10 @@
551547 if (!lance_tx_buffs_avail(lp))
552548 goto out_free;
553549
554
-#ifdef DEBUG
555550 /* 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
+
559554 entry = lp->tx_new & lp->tx_ring_mod_mask;
560555 ib->btx_ring[entry].length = (-skblen) | 0xf000;
561556 ib->btx_ring[entry].misc = 0;