forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/drivers/net/ethernet/3com/3c509.c
....@@ -60,8 +60,6 @@
6060 */
6161 
6262 #define DRV_NAME	"3c509"
63
-#define DRV_VERSION	"1.20"
64
-#define DRV_RELDATE	"04Feb2008"
6563 
6664 /* A few values that may be tweaked. */
6765 
....@@ -91,8 +89,6 @@
9189 #include <linux/uaccess.h>
9290 #include <asm/io.h>
9391 #include <asm/irq.h>
94
-
95
-static char version[] = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
9692 
9793 #ifdef EL3_DEBUG
9894 static int el3_debug = EL3_DEBUG;
....@@ -196,7 +192,7 @@
196192 static int el3_rx(struct net_device *dev);
197193 static int el3_close(struct net_device *dev);
198194 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);
200196 static void el3_down(struct net_device *dev);
201197 static void el3_up(struct net_device *dev);
202198 static const struct ethtool_ops ethtool_ops;
....@@ -547,8 +543,6 @@
547543 	       dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)],
548544 	       dev->dev_addr, dev->irq);
549545 
550
-	if (el3_debug > 0)
551
-		pr_info("%s", version);
552546 	return 0;
553547 
554548 }
....@@ -689,7 +683,7 @@
689683 }
690684 
691685 static void
692
-el3_tx_timeout (struct net_device *dev)
686
+el3_tx_timeout (struct net_device *dev, unsigned int txqueue)
693687 {
694688 	int ioaddr = dev->base_addr;
695689 
....@@ -1143,7 +1137,6 @@
11431137 static void el3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
11441138 {
11451139 	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
1146
-	strlcpy(info->version, DRV_VERSION, sizeof(info->version));
11471140 }
11481141 
11491142 static int el3_get_link_ksettings(struct net_device *dev,
....@@ -1266,12 +1259,14 @@
12661259 					pr_cont("Forcing 3c5x9b full-duplex mode");
12671260 					break;
12681261 				}
1262
+				fallthrough;
12691263 			case 8:
12701264 				/* set full-duplex mode based on eeprom config setting */
12711265 				if ((sw_info & 0x000f) && (sw_info & 0x8000)) {
12721266 					pr_cont("Setting 3c5x9b full-duplex mode (from EEPROM configuration bit)");
12731267 					break;
12741268 				}
1269
+				fallthrough;
12751270 			default:
12761271 				/* xcvr=(0 || 4) OR user has an old 3c5x9 non "B" model */
12771272 				pr_cont("Setting 3c5x9/3c5x9B half-duplex mode");