linux-kernel - [PATCH] Fix embedded nic order on Dell PowerEdge systems

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1307564053-2996-1-git-send-email-kernel@linuxace.com>
Date:	Wed,  8 Jun 2011 13:14:13 -0700
From:	Phil Oester <kernel@...uxace.com>
To:	linux-kernel@...r.kernel.org
Cc:	Narendra_K@...l.com, jordan_hargrave@...l.com,
	jbarnes@...tuousgeek.org
Subject: [PATCH] Fix embedded nic order on Dell PowerEdge systems

    In commit 6e8af08dfa40b747002207d3ce8e8b43a050d99f ("PCI: enable pci=bfsort
    by default on future Dell systems"), the callback added was placed at the
    top of the list, before the specific PowerEdge models.  This ends up
    breaking the more specific models listed, since the new callback handles
    all Dell systems but the older systems don't have the new 0xB1 smbios
    entry.
    
    Fix this by placing the new check _after_ the more specific PowerEdge
    sytems.
    
    Phil Oester
    
    Signed-off-by: Phil Oester <kernel@...uxace.com>

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 5fe7502..92df322 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -247,13 +247,6 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = {
 	},
 #endif		/* __i386__ */
 	{
-		.callback = find_sort_method,
-		.ident = "Dell System",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
-		},
-	},
-	{
 		.callback = set_bf_sort,
 		.ident = "Dell PowerEdge 1950",
 		.matches = {
@@ -294,6 +287,13 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = {
 		},
 	},
 	{
+		.callback = find_sort_method,
+		.ident = "Dell System",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+		},
+	},
+	{
 		.callback = set_bf_sort,
 		.ident = "HP ProLiant BL20p G3",
 		.matches = {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/