hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/net/ethernet/amd/lance.c
....@@ -306,7 +306,7 @@
306306 static int lance_close(struct net_device *dev);
307307 static struct net_device_stats *lance_get_stats(struct net_device *dev);
308308 static void set_multicast_list(struct net_device *dev);
309
-static void lance_tx_timeout (struct net_device *dev);
309
+static void lance_tx_timeout (struct net_device *dev, unsigned int txqueue);
310310
311311
312312
....@@ -913,7 +913,7 @@
913913 }
914914
915915
916
-static void lance_tx_timeout (struct net_device *dev)
916
+static void lance_tx_timeout (struct net_device *dev, unsigned int txqueue)
917917 {
918918 struct lance_private *lp = (struct lance_private *) dev->ml_priv;
919919 int ioaddr = dev->base_addr;
....@@ -997,7 +997,7 @@
997997 skb_copy_from_linear_data(skb, &lp->tx_bounce_buffs[entry], skb->len);
998998 lp->tx_ring[entry].base =
999999 ((u32)isa_virt_to_bus((lp->tx_bounce_buffs + entry)) & 0xffffff) | 0x83000000;
1000
- dev_kfree_skb(skb);
1000
+ dev_consume_skb_irq(skb);
10011001 } else {
10021002 lp->tx_skbuff[entry] = skb;
10031003 lp->tx_ring[entry].base = ((u32)isa_virt_to_bus(skb->data) & 0xffffff) | 0x83000000;
....@@ -1084,7 +1084,7 @@
10841084 /* We must free the original skb if it's not a data-only copy
10851085 in the bounce buffer. */
10861086 if (lp->tx_skbuff[entry]) {
1087
- dev_kfree_skb_irq(lp->tx_skbuff[entry]);
1087
+ dev_consume_skb_irq(lp->tx_skbuff[entry]);
10881088 lp->tx_skbuff[entry] = NULL;
10891089 }
10901090 dirty_tx++;