rtlwifi: rtl8192se: Remove need to disable ASPM

When this driver was initially submitted, the system would crash unless
ASPM was disabled. This problem has been fixed.

This patch also adds a printk that outputs the name of the firmware
file that is used.

Signed-off-by: Chaoming_Li <chaoming_li@realsil.com.cn>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 3550c9fb96e5ff9fb58012c5942677a84a85bb31..a4095284543677d28fc39852361ede477546f654 100644 (file)
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1611,6 +1611,7 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
        u16 irqline;
        u8 tmp;
 
+       pcipriv->ndis_adapter.pcibridge_vendor = PCI_BRIDGE_VENDOR_UNKNOWN;
        venderid = pdev->vendor;
        deviceid = pdev->device;
        pci_read_config_byte(pdev, 0x8, &revisionid);

diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 7cfd6a2cb140d0d86008c5ed4748b118f10f48ff..1c6cb1d7d660db4987e3cc9dc97004b62509de0f 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -58,7 +58,7 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw)
         * 4 - Always Enable ASPM without Clock Req.
         * set defult to RTL8192CE:3 RTL8192E:2
         * */
-       rtlpci->const_pci_aspm = 0; /* changed from 2 due to crashes */
+       rtlpci->const_pci_aspm = 2;
 
        /*Setting for PCI-E device */
        rtlpci->const_devicepci_aspm_setting = 0x03;
@@ -183,6 +183,8 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
                return 1;
        }
 
+       printk(KERN_INFO "rtl8192se: Driver for Realtek RTL8192SE/RTL8191SE\n"
+              "           Loading firmware %s\n", rtlpriv->cfg->fw_name);
        /* request fw */
        err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
                        rtlpriv->io.dev);