hc
2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb
kernel/drivers/net/ethernet/apple/macmace.c
....@@ -1,12 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * Driver for the Macintosh 68K onboard MACE controller with PSC
34 * driven DMA. The MACE driver code is derived from mace.c. The
45 * 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.
106 *
117 * Copyright (C) 1996 Paul Mackerras.
128 * Copyright (C) 1998 Alan Cox <alan@lxorguk.ukuu.org.uk>
....@@ -95,7 +91,7 @@
9591 static void mace_reset(struct net_device *dev);
9692 static irqreturn_t mace_interrupt(int irq, void *dev_id);
9793 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);
9995 static void __mace_set_address(struct net_device *dev, void *addr);
10096
10197 /*
....@@ -604,7 +600,7 @@
604600 return IRQ_HANDLED;
605601 }
606602
607
-static void mace_tx_timeout(struct net_device *dev)
603
+static void mace_tx_timeout(struct net_device *dev, unsigned int txqueue)
608604 {
609605 struct mace_data *mp = netdev_priv(dev);
610606 volatile struct mace *mb = mp->mace;