Skip to content

Commit 8eef5c3

Browse files
Sasha Neftinkuba-moo
authored andcommitted
Revert "igc: fix a log entry using uninitialized netdev"
This reverts commit 8616718. 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/ [1] Link: https://lore.kernel.org/all/87o78rmkhu.fsf@intel.com/ [2] Fixes: 8616718 ("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>
1 parent b60b1bd commit 8eef5c3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/net/ethernet/intel/igc/igc_main.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7032,6 +7032,8 @@ static int igc_probe(struct pci_dev *pdev,
70327032
device_set_wakeup_enable(&adapter->pdev->dev,
70337033
adapter->flags & IGC_FLAG_WOL_SUPPORTED);
70347034

7035+
igc_ptp_init(adapter);
7036+
70357037
igc_tsn_clear_schedule(adapter);
70367038

70377039
/* reset the hardware with the new settings */
@@ -7053,9 +7055,6 @@ static int igc_probe(struct pci_dev *pdev,
70537055
/* Check if Media Autosense is enabled */
70547056
adapter->ei = *ei;
70557057

7056-
/* do hw tstamp init after resetting */
7057-
igc_ptp_init(adapter);
7058-
70597058
/* print pcie link status and MAC address */
70607059
pcie_print_link_status(pdev);
70617060
netdev_info(netdev, "MAC: %pM\n", netdev->dev_addr);

0 commit comments

Comments
 (0)