disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/net/ethernet/3com/3c509.c
..
..
@@ -60,8 +60,6 @@
60
60
 */
61
61
 
62
62
 #define DRV_NAME	"3c509"
63
-#define DRV_VERSION	"1.20"
64
-#define DRV_RELDATE	"04Feb2008"
65
63
 
66
64
 /* A few values that may be tweaked. */
67
65
 
..
..
@@ -91,8 +89,6 @@
91
89
 #include <linux/uaccess.h>
92
90
 #include <asm/io.h>
93
91
 #include <asm/irq.h>
94
-
95
-static char version[] = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
96
92
 
97
93
 #ifdef EL3_DEBUG
98
94
 static int el3_debug = EL3_DEBUG;
..
..
@@ -196,7 +192,7 @@
196
192
 static int el3_rx(struct net_device *dev);
197
193
 static int el3_close(struct net_device *dev);
198
194
 static void set_multicast_list(struct net_device *dev);
199
-static void el3_tx_timeout (struct net_device *dev);
195
+static void el3_tx_timeout (struct net_device *dev, unsigned int txqueue);
200
196
 static void el3_down(struct net_device *dev);
201
197
 static void el3_up(struct net_device *dev);
202
198
 static const struct ethtool_ops ethtool_ops;
..
..
@@ -547,8 +543,6 @@
547
543
 	       dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)],
548
544
 	       dev->dev_addr, dev->irq);
549
545
 
550
-	if (el3_debug > 0)
551
-		pr_info("%s", version);
552
546
 	return 0;
553
547
 
554
548
 }
..
..
@@ -689,7 +683,7 @@
689
683
 }
690
684
 
691
685
 static void
692
-el3_tx_timeout (struct net_device *dev)
686
+el3_tx_timeout (struct net_device *dev, unsigned int txqueue)
693
687
 {
694
688
 	int ioaddr = dev->base_addr;
695
689
 
..
..
@@ -1143,7 +1137,6 @@
1143
1137
 static void el3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
1144
1138
 {
1145
1139
 	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
1146
-	strlcpy(info->version, DRV_VERSION, sizeof(info->version));
1147
1140
 }
1148
1141
 
1149
1142
 static int el3_get_link_ksettings(struct net_device *dev,
..
..
@@ -1266,12 +1259,14 @@
1266
1259
 					pr_cont("Forcing 3c5x9b full-duplex mode");
1267
1260
 					break;
1268
1261
 				}
1262
+				fallthrough;
1269
1263
 			case 8:
1270
1264
 				/* set full-duplex mode based on eeprom config setting */
1271
1265
 				if ((sw_info & 0x000f) && (sw_info & 0x8000)) {
1272
1266
 					pr_cont("Setting 3c5x9b full-duplex mode (from EEPROM configuration bit)");
1273
1267
 					break;
1274
1268
 				}
1269
+				fallthrough;
1275
1270
 			default:
1276
1271
 				/* xcvr=(0 || 4) OR user has an old 3c5x9 non "B" model */
1277
1272
 				pr_cont("Setting 3c5x9/3c5x9B half-duplex mode");