2011/5/6 Gábor Stefanik <netrolller.3d@xxxxxxxxx>: > On Fri, May 6, 2011 at 9:02 PM, Larry Finger <Larry.Finger@xxxxxxxxxxxx> wrote: >> From: Chaoming Li <chaoming_li@xxxxxxxxxxxxxx> >> >> 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@xxxxxxxxxxxxxx> >> Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx> >> --- >> >> John, >> >> This is 2.6.40 material. >> >> Larry >> --- >> >> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c >> =================================================================== >> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/pci.c >> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c >> @@ -1611,6 +1611,7 @@ static bool _rtl_pci_find_adapter(struct >> 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); >> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192se/sw.c >> =================================================================== >> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192se/sw.c >> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192se/sw.c >> @@ -58,7 +58,7 @@ static void rtl92s_init_aspm_vars(struct >> * 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; /* changed from 2 due to crashes */ > > Remove the comment too, please. > >> >> /*Setting for PCI-E device */ >> rtlpci->const_devicepci_aspm_setting = 0x03; >> @@ -183,6 +183,8 @@ static int rtl92s_init_sw_vars(struct ie >> return 1; >> } >> >> + printk(KERN_INFO "rtl8192se: Driver for Realtek RTL8192SE/RTL8191SE\n" >> + " Loading firmware %s\n", rtlpriv->cfg->fw_name); > > Unrelated change. > Oops... ignore this comment, I did not read the commit message in its entirety. >> /* request fw */ >> err = request_firmware(&firmware, rtlpriv->cfg->fw_name, >> rtlpriv->io.dev); >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in >> the body of a message to majordomo@xxxxxxxxxxxxxxx >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > > > > -- > Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-) > -- Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html