移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/ethernet/apple/macmace.c
..
..
@@ -1,12 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *	Driver for the Macintosh 68K onboard MACE controller with PSC
3
4
  *	driven DMA. The MACE driver code is derived from mace.c. The
4
5
  *	Mac68k theory of operation is courtesy of the MacBSD wizards.
5
- *
6
- *	This program is free software; you can redistribute it and/or
7
- *	modify it under the terms of the GNU General Public License
8
- *	as published by the Free Software Foundation; either version
9
- *	2 of the License, or (at your option) any later version.
10
6
  *
11
7
  *	Copyright (C) 1996 Paul Mackerras.
12
8
  *	Copyright (C) 1998 Alan Cox <alan@lxorguk.ukuu.org.uk>
..
..
@@ -95,7 +91,7 @@
95
91
 static void mace_reset(struct net_device *dev);
96
92
 static irqreturn_t mace_interrupt(int irq, void *dev_id);
97
93
 static irqreturn_t mace_dma_intr(int irq, void *dev_id);
98
-static void mace_tx_timeout(struct net_device *dev);
94
+static void mace_tx_timeout(struct net_device *dev, unsigned int txqueue);
99
95
 static void __mace_set_address(struct net_device *dev, void *addr);
100
96
 
101
97
 /*
..
..
@@ -604,7 +600,7 @@
604
600
 	return IRQ_HANDLED;
605
601
 }
606
602
 
607
-static void mace_tx_timeout(struct net_device *dev)
603
+static void mace_tx_timeout(struct net_device *dev, unsigned int txqueue)
608
604
 {
609
605
 	struct mace_data *mp = netdev_priv(dev);
610
606
 	volatile struct mace *mb = mp->mace;