hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/net/fjes/fjes_main.c
....@@ -1,22 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * FUJITSU Extended Socket Network Device driver
34 * Copyright (c) 2015 FUJITSU LIMITED
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms and conditions of the GNU General Public License,
7
- * version 2, as published by the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
12
- * more details.
13
- *
14
- * You should have received a copy of the GNU General Public License along with
15
- * this program; if not, see <http://www.gnu.org/licenses/>.
16
- *
17
- * The full GNU General Public License is included in this distribution in
18
- * the file called "COPYING".
19
- *
205 */
216
227 #include <linux/module.h>
....@@ -63,7 +48,7 @@
6348 static int fjes_change_mtu(struct net_device *, int);
6449 static int fjes_vlan_rx_add_vid(struct net_device *, __be16 proto, u16);
6550 static int fjes_vlan_rx_kill_vid(struct net_device *, __be16 proto, u16);
66
-static void fjes_tx_retry(struct net_device *);
51
+static void fjes_tx_retry(struct net_device *, unsigned int txqueue);
6752
6853 static int fjes_acpi_add(struct acpi_device *);
6954 static int fjes_acpi_remove(struct acpi_device *);
....@@ -810,7 +795,7 @@
810795 return ret;
811796 }
812797
813
-static void fjes_tx_retry(struct net_device *netdev)
798
+static void fjes_tx_retry(struct net_device *netdev, unsigned int txqueue)
814799 {
815800 struct netdev_queue *queue = netdev_get_tx_queue(netdev, 0);
816801
....@@ -989,7 +974,7 @@
989974 FJES_RX_STOP_REQ_DONE;
990975 spin_unlock_irqrestore(&hw->rx_status_lock, flags);
991976 clear_bit(src_epid, &hw->txrx_stop_req_bit);
992
- /* fall through */
977
+ fallthrough;
993978 case EP_PARTNER_UNSHARE:
994979 case EP_PARTNER_COMPLETE:
995980 default: