add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/drivers/net/ethernet/amd/atarilance.c
..
..
@@ -156,7 +156,7 @@
156
156
 	struct lance_init_block	init;
157
157
 	struct lance_tx_head	tx_head[TX_RING_SIZE];
158
158
 	struct lance_rx_head	rx_head[RX_RING_SIZE];
159
-	char					packet_area[0];	/* packet data follow after the
159
+	char					packet_area[];	/* packet data follow after the
160
160
 											 * init block and the ring
161
161
 											 * descriptors and are located
162
162
 											 * at runtime */
..
..
@@ -346,7 +346,7 @@
346
346
 static int lance_close( struct net_device *dev );
347
347
 static void set_multicast_list( struct net_device *dev );
348
348
 static int lance_set_mac_address( struct net_device *dev, void *addr );
349
-static void lance_tx_timeout (struct net_device *dev);
349
+static void lance_tx_timeout (struct net_device *dev, unsigned int txqueue);
350
350
 
351
351
 /************************* End of Prototypes **************************/
352
352
 
..
..
@@ -727,7 +727,7 @@
727
727
 /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
728
728
 
729
729
 
730
-static void lance_tx_timeout (struct net_device *dev)
730
+static void lance_tx_timeout (struct net_device *dev, unsigned int txqueue)
731
731
 {
732
732
 	struct lance_private *lp = netdev_priv(dev);
733
733
 	struct lance_ioreg	 *IO = lp->iobase;
..
..
@@ -825,7 +825,7 @@
825
825
 	lp->memcpy_f( PKTBUF_ADDR(head), (void *)skb->data, skb->len );
826
826
 	head->flag = TMD1_OWN_CHIP | TMD1_ENP | TMD1_STP;
827
827
 	dev->stats.tx_bytes += skb->len;
828
-	dev_kfree_skb( skb );
828
+	dev_consume_skb_irq(skb);
829
829
 	lp->cur_tx++;
830
830
 	while( lp->cur_tx >= TX_RING_SIZE && lp->dirty_tx >= TX_RING_SIZE ) {
831
831
 		lp->cur_tx -= TX_RING_SIZE;