hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614
kernel/drivers/net/ethernet/apple/bmac.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Network device driver for the BMAC ethernet controller on
34 * Apple Powermacs. Assumes it's under a DBDMA controller.
....@@ -23,11 +24,11 @@
2324 #include <linux/bitrev.h>
2425 #include <linux/ethtool.h>
2526 #include <linux/slab.h>
27
+#include <linux/pgtable.h>
2628 #include <asm/prom.h>
2729 #include <asm/dbdma.h>
2830 #include <asm/io.h>
2931 #include <asm/page.h>
30
-#include <asm/pgtable.h>
3132 #include <asm/machdep.h>
3233 #include <asm/pmac_feature.h>
3334 #include <asm/macio.h>
....@@ -777,7 +778,7 @@
777778
778779 if (bp->tx_bufs[bp->tx_empty]) {
779780 ++dev->stats.tx_packets;
780
- dev_kfree_skb_irq(bp->tx_bufs[bp->tx_empty]);
781
+ dev_consume_skb_irq(bp->tx_bufs[bp->tx_empty]);
781782 }
782783 bp->tx_bufs[bp->tx_empty] = NULL;
783784 bp->tx_fullup = 0;
....@@ -814,8 +815,8 @@
814815 static unsigned int
815816 crc416(unsigned int curval, unsigned short nxtval)
816817 {
817
- register unsigned int counter, cur = curval, next = nxtval;
818
- register int high_crc_set, low_data_set;
818
+ unsigned int counter, cur = curval, next = nxtval;
819
+ int high_crc_set, low_data_set;
819820
820821 /* Swap bytes */
821822 next = ((next & 0x00FF) << 8) | (next >> 8);