From: marshall.shao@dell.com
To: Jesse Brandeburg <jesse.brandeburg@intel.com>,
Tony Nguyen <anthony.l.nguyen@intel.com>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Jacob Keller <jacob.e.keller@intel.com>,
Simon Horman <simon.horman@corigine.com>,
Akihiko Odaki <akihiko.odaki@daynix.com>,
Kees Cook <keescook@chromium.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Aleksandr Loktionov <aleksandr.loktionov@intel.com>,
Lin Ma <linma@zju.edu.cn>,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Marshall Shao <Marshall.Shao@dell.com>
Subject: [PATCH] Fix kernel panic issue after removing igb driver
Date: Fri, 11 Aug 2023 20:02:25 +0800 [thread overview]
Message-ID: <20230811120225.4133-1-marshall.shao@dell.com> (raw)
From: Marshall Shao <Marshall.Shao@dell.com>
This patch fixes a kernel panic issue after removing the igb driver
from the usermode.
A delayed work will be schedule in igb_ptp_init(),
if (adapter->ptp_flags & IGB_PTP_OVERFLOW_CHECK)
INIT_DELAYED_WORK(&adapter->ptp_overflow_work,
igb_ptp_overflow_check);
If CONFIG_PTP_1588_CLOCK is not enabled, the delayed work cannot be
cancelled when igb_ptp_suspend is called.
Signed-off-by: Marshall Shao <Marshall.Shao@dell.com>
---
drivers/net/ethernet/intel/igb/igb_ptp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index 405886ee5261..b21822ea1c7d 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -1435,12 +1435,12 @@ void igb_ptp_sdp_init(struct igb_adapter *adapter)
*/
void igb_ptp_suspend(struct igb_adapter *adapter)
{
- if (!(adapter->ptp_flags & IGB_PTP_ENABLED))
- return;
-
if (adapter->ptp_flags & IGB_PTP_OVERFLOW_CHECK)
cancel_delayed_work_sync(&adapter->ptp_overflow_work);
+ if (!(adapter->ptp_flags & IGB_PTP_ENABLED))
+ return;
+
cancel_work_sync(&adapter->ptp_tx_work);
if (adapter->ptp_tx_skb) {
dev_kfree_skb_any(adapter->ptp_tx_skb);
--
2.34.1
next reply other threads:[~2023-08-11 12:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-11 12:02 marshall.shao [this message]
2023-08-11 16:12 ` Vadim Fedorenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230811120225.4133-1-marshall.shao@dell.com \
--to=marshall.shao@dell.com \
--cc=akihiko.odaki@daynix.com \
--cc=aleksandr.loktionov@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jacob.e.keller@intel.com \
--cc=jesse.brandeburg@intel.com \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linma@zju.edu.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=simon.horman@corigine.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®