disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/net/ethernet/i825xx/82596.c
..
..
@@ -53,10 +53,10 @@
53
53
 #include <linux/init.h>
54
54
 #include <linux/bitops.h>
55
55
 #include <linux/gfp.h>
56
+#include <linux/pgtable.h>
56
57
 
57
58
 #include <asm/io.h>
58
59
 #include <asm/dma.h>
59
-#include <asm/pgtable.h>
60
60
 #include <asm/cacheflush.h>
61
61
 
62
62
 static char version[] __initdata =
..
..
@@ -363,7 +363,7 @@
363
363
 static irqreturn_t i596_interrupt(int irq, void *dev_id);
364
364
 static int i596_close(struct net_device *dev);
365
365
 static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd);
366
-static void i596_tx_timeout (struct net_device *dev);
366
+static void i596_tx_timeout (struct net_device *dev, unsigned int txqueue);
367
367
 static void print_eth(unsigned char *buf, char *str);
368
368
 static void set_multicast_list(struct net_device *dev);
369
369
 
..
..
@@ -1019,7 +1019,7 @@
1019
1019
 	return res;
1020
1020
 }
1021
1021
 
1022
-static void i596_tx_timeout (struct net_device *dev)
1022
+static void i596_tx_timeout (struct net_device *dev, unsigned int txqueue)
1023
1023
 {
1024
1024
 	struct i596_private *lp = dev->ml_priv;
1025
1025
 	int ioaddr = dev->base_addr;
..
..
@@ -1310,7 +1310,7 @@
1310
1310
 						dev->stats.tx_aborted_errors++;
1311
1311
 				}
1312
1312
 
1313
-				dev_kfree_skb_irq(skb);
1313
+				dev_consume_skb_irq(skb);
1314
1314
 
1315
1315
 				tx_cmd->cmd.command = 0; /* Mark free */
1316
1316
 				break;