kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/net/ethernet/toshiba/ps3_gelic_net.h
..
..
@@ -1,3 +1,4 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
1
2
 /*
2
3
  *  PS3 Platfom gelic network driver.
3
4
  *
..
..
@@ -10,20 +11,6 @@
10
11
  *
11
12
  * Authors : Utz Bacher <utz.bacher@de.ibm.com>
12
13
  *           Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
13
- *
14
- * This program is free software; you can redistribute it and/or modify
15
- * it under the terms of the GNU General Public License as published by
16
- * the Free Software Foundation; either version 2, or (at your option)
17
- * any later version.
18
- *
19
- * This program is distributed in the hope that it will be useful,
20
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
21
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
22
- * GNU General Public License for more details.
23
- *
24
- * You should have received a copy of the GNU General Public License
25
- * along with this program; if not, write to the Free Software
26
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
27
14
  */
28
15
 #ifndef _GELIC_NET_H
29
16
 #define _GELIC_NET_H
..
..
@@ -314,14 +301,14 @@
314
301
 	 */
315
302
 	unsigned int irq;
316
303
 	struct gelic_descr *tx_top, *rx_top;
317
-	struct gelic_descr descr[0]; /* must be the last */
304
+	struct gelic_descr descr[]; /* must be the last */
318
305
 };
319
306
 
320
307
 struct gelic_port {
321
308
 	struct gelic_card *card;
322
309
 	struct net_device *netdev;
323
310
 	enum gelic_port_type type;
324
-	long priv[0]; /* long for alignment */
311
+	long priv[]; /* long for alignment */
325
312
 };
326
313
 
327
314
 static inline struct gelic_card *port_to_card(struct gelic_port *p)
..
..
@@ -372,7 +359,7 @@
372
359
 int gelic_net_stop(struct net_device *netdev);
373
360
 netdev_tx_t gelic_net_xmit(struct sk_buff *skb, struct net_device *netdev);
374
361
 void gelic_net_set_multi(struct net_device *netdev);
375
-void gelic_net_tx_timeout(struct net_device *netdev);
362
+void gelic_net_tx_timeout(struct net_device *netdev, unsigned int txqueue);
376
363
 int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card);
377
364
 
378
365
 /* shared ethtool ops */