Patchwork [3.5.y.z,extended,stable] Patch "ixgbe: fix registration order of driver and DCA nofitication" has been added to staging queue

mail settings
Submitter Luis Henriques
Date April 11, 2013, 9:09 a.m.
Message ID <>
Download mbox | patch
Permalink /patch/235619/
State New
Headers show


Luis Henriques - April 11, 2013, 9:09 a.m.
This is a note to let you know that I have just added a patch titled

    ixgbe: fix registration order of driver and DCA nofitication

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see



From c3a59b7c76c23976377671a439e24df5adc0c4e9 Mon Sep 17 00:00:00 2001
From: Jakub Kicinski <>
Date: Wed, 3 Apr 2013 16:50:54 +0000
Subject: [PATCH] ixgbe: fix registration order of driver and DCA nofitication

commit f01fc1a82c2ee68726b400fadb156bd623b5f2f1 upstream.

ixgbe_notify_dca cannot be called before driver registration
because it expects driver's klist_devices to be allocated and
initialized. While on it make sure debugfs files are removed
when registration fails.

Signed-off-by: Jakub Kicinski <>
Tested-by: Phil Schmitt <>
Signed-off-by: Jeff Kirsher <>
Signed-off-by: David S. Miller <>
[ luis: backported to 3.5: removed debugfs code ]
Signed-off-by: Luis Henriques <>
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)



diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 7c0878f..ab8d882 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7662,12 +7662,15 @@  static int __init ixgbe_init_module(void)
 	pr_info("%s - version %s\n", ixgbe_driver_string, ixgbe_driver_version);
 	pr_info("%s\n", ixgbe_copyright);

+	ret = pci_register_driver(&ixgbe_driver);
+	if (ret)
+		return ret;

-	ret = pci_register_driver(&ixgbe_driver);
-	return ret;
+	return 0;