.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * Network device driver for the BMAC ethernet controller on |
---|
3 | 4 | * Apple Powermacs. Assumes it's under a DBDMA controller. |
---|
.. | .. |
---|
23 | 24 | #include <linux/bitrev.h> |
---|
24 | 25 | #include <linux/ethtool.h> |
---|
25 | 26 | #include <linux/slab.h> |
---|
| 27 | +#include <linux/pgtable.h> |
---|
26 | 28 | #include <asm/prom.h> |
---|
27 | 29 | #include <asm/dbdma.h> |
---|
28 | 30 | #include <asm/io.h> |
---|
29 | 31 | #include <asm/page.h> |
---|
30 | | -#include <asm/pgtable.h> |
---|
31 | 32 | #include <asm/machdep.h> |
---|
32 | 33 | #include <asm/pmac_feature.h> |
---|
33 | 34 | #include <asm/macio.h> |
---|
.. | .. |
---|
777 | 778 | |
---|
778 | 779 | if (bp->tx_bufs[bp->tx_empty]) { |
---|
779 | 780 | ++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]); |
---|
781 | 782 | } |
---|
782 | 783 | bp->tx_bufs[bp->tx_empty] = NULL; |
---|
783 | 784 | bp->tx_fullup = 0; |
---|
.. | .. |
---|
814 | 815 | static unsigned int |
---|
815 | 816 | crc416(unsigned int curval, unsigned short nxtval) |
---|
816 | 817 | { |
---|
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; |
---|
819 | 820 | |
---|
820 | 821 | /* Swap bytes */ |
---|
821 | 822 | next = ((next & 0x00FF) << 8) | (next >> 8); |
---|