|
@@ -7387,9 +7387,10 @@ static void rtl_remove_one(struct pci_dev *pdev)
|
|
|
struct net_device *dev = pci_get_drvdata(pdev);
|
|
|
struct rtl8169_private *tp = netdev_priv(dev);
|
|
|
|
|
|
- if (tp->mac_version == RTL_GIGA_MAC_VER_27 ||
|
|
|
- tp->mac_version == RTL_GIGA_MAC_VER_28 ||
|
|
|
- tp->mac_version == RTL_GIGA_MAC_VER_31) {
|
|
|
+ if ((tp->mac_version == RTL_GIGA_MAC_VER_27 ||
|
|
|
+ tp->mac_version == RTL_GIGA_MAC_VER_28 ||
|
|
|
+ tp->mac_version == RTL_GIGA_MAC_VER_31) &&
|
|
|
+ r8168_check_dash(tp)) {
|
|
|
rtl8168_driver_stop(tp);
|
|
|
}
|
|
|
|
|
@@ -7822,9 +7823,10 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
rtl_chip_infos[chipset].jumbo_tx_csum ? "ok" : "ko");
|
|
|
}
|
|
|
|
|
|
- if (tp->mac_version == RTL_GIGA_MAC_VER_27 ||
|
|
|
- tp->mac_version == RTL_GIGA_MAC_VER_28 ||
|
|
|
- tp->mac_version == RTL_GIGA_MAC_VER_31) {
|
|
|
+ if ((tp->mac_version == RTL_GIGA_MAC_VER_27 ||
|
|
|
+ tp->mac_version == RTL_GIGA_MAC_VER_28 ||
|
|
|
+ tp->mac_version == RTL_GIGA_MAC_VER_31) &&
|
|
|
+ r8168_check_dash(tp)) {
|
|
|
rtl8168_driver_start(tp);
|
|
|
}
|
|
|
|