| Message ID | 1295902459.16789.74.camel@fourier |
|---|---|
| State | Accepted |
| Delegated to: | Tim Gardner |
| Headers | show |
On 01/24/2011 01:54 PM, Kamal Mostafa wrote: > SRU Justification: > > Impact: We need this patch to fix Wi-fi kill switch behavior on some > upcoming Dell systems. I submitted the patch to stable on 2010-12-22, > where it is still pending review. > > Fix: The following patch is taken from upstream and is included in>= > 2.6.36. > > Testcase: We have tested this patch internally (LP: #687526). > > --- > commit 86faa39c352bc316b6ab1335975a2bbe11a5dca0 > Author: Rezwanul Kabir<Rezwanul_Kabir@dell.com> > Date: Wed Jun 23 12:02:43 2010 -0500 > > UBUNTU: SAUCE: dell-laptop: Add another Dell laptop family to the DMI whitelist > > This is to support Precision M4500 and others. > > Signed-off-by: Rezwanul Kabir<Rezwanul_Kabir@dell.com> > Signed-off-by: Matthew Garrett<mjg@redhat.com> > (originally from commit 410d44c74cf9942e3055d5b7d73953fac8efbacb) > Signed-off-by: Kamal Mostafa<kamal@canonical.com> > > diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c > index a224f49..723e6cf 100644 > --- a/drivers/platform/x86/dell-laptop.c > +++ b/drivers/platform/x86/dell-laptop.c > @@ -84,6 +84,19 @@ static const struct dmi_system_id __initdata dell_device_table[] = { > DMI_MATCH(DMI_CHASSIS_TYPE, "8"), > }, > }, > + { > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), > + DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /*Laptop*/ > + }, > + }, > + { > + .ident = "Dell Computer Corporation", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), > + DMI_MATCH(DMI_CHASSIS_TYPE, "8"), > + }, > + }, > { } > }; > > @@ -603,3 +616,5 @@ MODULE_AUTHOR("Matthew Garrett<mjg@redhat.com>"); > MODULE_DESCRIPTION("Dell laptop driver"); > MODULE_LICENSE("GPL"); > MODULE_ALIAS("dmi:*svnDellInc.:*:ct8:*"); > +MODULE_ALIAS("dmi:*svnDellInc.:*:ct9:*"); > +MODULE_ALIAS("dmi:*svnDellComputerCorporation.:*:ct8:*"); > > Hmm, this patch appears to be the combination of cb6a7937f4328a267e0806680ade500ed2c3c01a and 410d44c74cf9942e3055d5b7d73953fac8efbacb. I prefer to keep them as distinct cherry-picked patches. rtg
On Mon, 2011-01-24 at 14:31 -0700, Tim Gardner wrote: > Hmm, this patch appears to be the combination of > cb6a7937f4328a267e0806680ade500ed2c3c01a and > 410d44c74cf9942e3055d5b7d73953fac8efbacb. I prefer to keep them as > distinct cherry-picked patches. > That makes very good sense! I will re-submit as two separate patches. -Kamal
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index a224f49..723e6cf 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -84,6 +84,19 @@ static const struct dmi_system_id __initdata dell_device_table[] = { DMI_MATCH(DMI_CHASSIS_TYPE, "8"), }, }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /*Laptop*/ + }, + }, + { + .ident = "Dell Computer Corporation", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), + DMI_MATCH(DMI_CHASSIS_TYPE, "8"), + }, + }, { } }; @@ -603,3 +616,5 @@ MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>"); MODULE_DESCRIPTION("Dell laptop driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("dmi:*svnDellInc.:*:ct8:*"); +MODULE_ALIAS("dmi:*svnDellInc.:*:ct9:*"); +MODULE_ALIAS("dmi:*svnDellComputerCorporation.:*:ct8:*");
SRU Justification: Impact: We need this patch to fix Wi-fi kill switch behavior on some upcoming Dell systems. I submitted the patch to stable on 2010-12-22, where it is still pending review. Fix: The following patch is taken from upstream and is included in >= 2.6.36. Testcase: We have tested this patch internally (LP: #687526). --- commit 86faa39c352bc316b6ab1335975a2bbe11a5dca0 Author: Rezwanul Kabir <Rezwanul_Kabir@dell.com> Date: Wed Jun 23 12:02:43 2010 -0500 UBUNTU: SAUCE: dell-laptop: Add another Dell laptop family to the DMI whitelist This is to support Precision M4500 and others. Signed-off-by: Rezwanul Kabir <Rezwanul_Kabir@dell.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> (originally from commit 410d44c74cf9942e3055d5b7d73953fac8efbacb) Signed-off-by: Kamal Mostafa <kamal@canonical.com>