projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b60b1bd
)
Revert "igc: fix a log entry using uninitialized netdev"
author
Sasha Neftin
<sasha.neftin@intel.com>
Tue, 11 Jun 2024 16:24:55 +0000
(09:24 -0700)
committer
Jakub Kicinski
<kuba@kernel.org>
Thu, 13 Jun 2024 14:24:52 +0000
(07:24 -0700)
This reverts commit
86167183a17e03ec77198897975e9fdfbd53cb0b
.
igc_ptp_init() needs to be called before igc_reset(), otherwise kernel
crash could be observed. Following the corresponding discussion [1] and
[2] revert this commit.
Link:
https://lore.kernel.org/all/8fb634f8-7330-4cf4-a8ce-485af9c0a61a@intel.com/
Link:
https://lore.kernel.org/all/87o78rmkhu.fsf@intel.com/
Fixes:
86167183a17e
("igc: fix a log entry using uninitialized netdev")
Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Link:
https://lore.kernel.org/r/20240611162456.961631-1-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/intel/igc/igc_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/intel/igc/igc_main.c
b/drivers/net/ethernet/intel/igc/igc_main.c
index
305e052
..
87b655b
100644
(file)
--- a/
drivers/net/ethernet/intel/igc/igc_main.c
+++ b/
drivers/net/ethernet/intel/igc/igc_main.c
@@
-7032,6
+7032,8
@@
static int igc_probe(struct pci_dev *pdev,
device_set_wakeup_enable(&adapter->pdev->dev,
adapter->flags & IGC_FLAG_WOL_SUPPORTED);
+ igc_ptp_init(adapter);
+
igc_tsn_clear_schedule(adapter);
/* reset the hardware with the new settings */
@@
-7053,9
+7055,6
@@
static int igc_probe(struct pci_dev *pdev,
/* Check if Media Autosense is enabled */
adapter->ei = *ei;
- /* do hw tstamp init after resetting */
- igc_ptp_init(adapter);
-
/* print pcie link status and MAC address */
pcie_print_link_status(pdev);
netdev_info(netdev, "MAC: %pM\n", netdev->dev_addr);