enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/net/ethernet/toshiba/ps3_gelic_net.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *  PS3 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
 
29
16
 #undef DEBUG
..
..
@@ -395,8 +382,6 @@
395
382
 	descr->skb = dev_alloc_skb(bufsize + GELIC_NET_RXBUF_ALIGN - 1);
396
383
 	if (!descr->skb) {
397
384
 		descr->buf_addr = 0; /* tell DMAC don't touch memory */
398
-		dev_info(ctodev(card),
399
-			 "%s:allocate skb failed !!\n", __func__);
400
385
 		return -ENOMEM;
401
386
 	}
402
387
 	descr->buf_size = cpu_to_be32(bufsize);
..
..
@@ -1163,7 +1148,7 @@
1163
1148
  * gelic_net_poll_controller - artificial interrupt for netconsole etc.
1164
1149
  * @netdev: interface device structure
1165
1150
  *
1166
- * see Documentation/networking/netconsole.txt
1151
+ * see Documentation/networking/netconsole.rst
1167
1152
  */
1168
1153
 void gelic_net_poll_controller(struct net_device *netdev)
1169
1154
 {
..
..
@@ -1418,7 +1403,7 @@
1418
1403
  *
1419
1404
  * called, if tx hangs. Schedules a task that resets the interface
1420
1405
  */
1421
-void gelic_net_tx_timeout(struct net_device *netdev)
1406
+void gelic_net_tx_timeout(struct net_device *netdev, unsigned int txqueue)
1422
1407
 {
1423
1408
 	struct gelic_card *card;
1424
1409