aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r--drivers/net/wireless/rtlwifi/pci.c2
-rw-r--r--drivers/net/wireless/rtlwifi/pci.h5
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 6a15f368ebb9..aa0ba9ec6aa9 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -390,7 +390,7 @@ static void rtl_pci_parse_configuration(struct pci_dev *pdev,
390 u8 linkctrl_reg; 390 u8 linkctrl_reg;
391 391
392 /*Link Control Register */ 392 /*Link Control Register */
393 pos = pci_find_capability(pdev, PCI_CAP_ID_EXP); 393 pos = pci_pcie_cap(pdev);
394 pci_read_config_byte(pdev, pos + PCI_EXP_LNKCTL, &linkctrl_reg); 394 pci_read_config_byte(pdev, pos + PCI_EXP_LNKCTL, &linkctrl_reg);
395 pcipriv->ndis_adapter.linkctrl_reg = linkctrl_reg; 395 pcipriv->ndis_adapter.linkctrl_reg = linkctrl_reg;
396 396
diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h
index 671b1f5aa0cf..76f42005a118 100644
--- a/drivers/net/wireless/rtlwifi/pci.h
+++ b/drivers/net/wireless/rtlwifi/pci.h
@@ -75,11 +75,6 @@
75#define PCI_CONF_ADDRESS 0x0CF8 /*PCI Configuration Space Address */ 75#define PCI_CONF_ADDRESS 0x0CF8 /*PCI Configuration Space Address */
76#define PCI_CONF_DATA 0x0CFC /*PCI Configuration Space Data */ 76#define PCI_CONF_DATA 0x0CFC /*PCI Configuration Space Data */
77 77
78#define PCI_CLASS_BRIDGE_DEV 0x06
79#define PCI_SUBCLASS_BR_PCI_TO_PCI 0x04
80#define PCI_CAPABILITY_ID_PCI_EXPRESS 0x10
81#define PCI_CAP_ID_EXP 0x10
82
83#define U1DONTCARE 0xFF 78#define U1DONTCARE 0xFF
84#define U2DONTCARE 0xFFFF 79#define U2DONTCARE 0xFFFF
85#define U4DONTCARE 0xFFFFFFFF 80#define U4DONTCARE 0xFFFFFFFF