add r8169 read mac form eeprom

hc

2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd

 kernel/drivers/net/ethernet/xircom/xirc2ps_cs.c
..
..
@@ -288,7 +288,7 @@
288
288
  */
289
289
 static netdev_tx_t do_start_xmit(struct sk_buff *skb,
290
290
 				       struct net_device *dev);
291
-static void xirc_tx_timeout(struct net_device *dev);
291
+static void xirc_tx_timeout(struct net_device *dev, unsigned int txqueue);
292
292
 static void xirc2ps_tx_timeout_task(struct work_struct *work);
293
293
 static void set_addresses(struct net_device *dev);
294
294
 static void set_multicast_list(struct net_device *dev);
..
..
@@ -503,6 +503,11 @@
503
503
 xirc2ps_detach(struct pcmcia_device *link)
504
504
 {
505
505
     struct net_device *dev = link->priv;
506
+    struct local_info *local = netdev_priv(dev);
507
+
508
+    netif_carrier_off(dev);
509
+    netif_tx_disable(dev);
510
+    cancel_work_sync(&local->tx_timeout_task);
506
511
 
507
512
     dev_dbg(&link->dev, "detach\n");
508
513
 
..
..
@@ -1203,7 +1208,7 @@
1203
1208
 }
1204
1209
 
1205
1210
 static void
1206
-xirc_tx_timeout(struct net_device *dev)
1211
+xirc_tx_timeout(struct net_device *dev, unsigned int txqueue)
1207
1212
 {
1208
1213
     struct local_info *lp = netdev_priv(dev);
1209
1214
     dev->stats.tx_errors++;
..
..
@@ -1434,7 +1439,7 @@
1434
1439
     switch(cmd) {
1435
1440
       case SIOCGMIIPHY:		/* Get the address of the PHY in use. */
1436
1441
 	data->phy_id = 0;	/* we have only this address */
1437
-	/* fall through */
1442
+	fallthrough;
1438
1443
       case SIOCGMIIREG:		/* Read the specified MII register. */
1439
1444
 	data->val_out = mii_rd(ioaddr, data->phy_id & 0x1f,
1440
1445
 			       data->reg_num & 0x1f);
..
..
@@ -1473,7 +1478,7 @@
1473
1478
     unsigned int ioaddr = dev->base_addr;
1474
1479
     unsigned value;
1475
1480
 
1476
-    pr_debug("%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full);
1481
+    pr_debug("%s: do_reset(%p,%d)\n", dev->name, dev, full);
1477
1482
 
1478
1483
     hardreset(dev);
1479
1484
     PutByte(XIRCREG_CR, SoftReset); /* set */