mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/net/ethernet/seeq/ether3.c
..
..
@@ -1,11 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  *  linux/drivers/acorn/net/ether3.c
3
4
  *
4
5
  *  Copyright (C) 1995-2000 Russell King
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License version 2 as
8
- * published by the Free Software Foundation.
9
6
  *
10
7
  * SEEQ nq8005 ethernet driver for Acorn/ANT Ether3 card
11
8
  *  for Acorn machines
..
..
@@ -82,7 +79,7 @@
82
79
 static irqreturn_t ether3_interrupt (int irq, void *dev_id);
83
80
 static int	ether3_close (struct net_device *dev);
84
81
 static void	ether3_setmulticastlist (struct net_device *dev);
85
-static void	ether3_timeout(struct net_device *dev);
82
+static void	ether3_timeout(struct net_device *dev, unsigned int txqueue);
86
83
 
87
84
 #define BUS_16		2
88
85
 #define BUS_8		1
..
..
@@ -453,7 +450,7 @@
453
450
 	ether3_outw(priv(dev)->regs.config1 | CFG1_LOCBUFMEM, REG_CONFIG1);
454
451
 }
455
452
 
456
-static void ether3_timeout(struct net_device *dev)
453
+static void ether3_timeout(struct net_device *dev, unsigned int txqueue)
457
454
 {
458
455
 	unsigned long flags;
459
456
 
..
..
@@ -613,12 +610,9 @@
613
610
 		ether3_readbuffer(dev, addrs+2, 12);
614
611
 
615
612
 if (next_ptr < RX_START || next_ptr >= RX_END) {
616
- int i;
617
613
  printk("%s: bad next pointer @%04X: ", dev->name, priv(dev)->rx_head);
618
614
  printk("%02X %02X %02X %02X ", next_ptr >> 8, next_ptr & 255, status & 255, status >> 8);
619
- for (i = 2; i < 14; i++)
620
-   printk("%02X ", addrs[i]);
621
- printk("\n");
615
+ printk("%pM %pM\n", addrs + 2, addrs + 8);
622
616
  next_ptr = priv(dev)->rx_head;
623
617
  break;
624
618
 }