Netdev List
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: jeff@garzik.org
Cc: netdev@vger.kernel.org, davem@davemloft.net,
	akpm@linux-foundation.org,
	Alexander Duyck <alexander.h.duyck@intel.com>,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [PATCH 2/8] igb: fix null pointer dereference seen with fiber NICs
Date: Fri, 01 Aug 2008 16:11:15 -0700	[thread overview]
Message-ID: <20080801231115.393.275.stgit@localhost.localdomain> (raw)
In-Reply-To: <20080801231106.393.46174.stgit@localhost.localdomain>

From: Alexander Duyck <alexander.h.duyck@intel.com>

With a fiber or serdes NIC installed the driver was causing a null pointer
dereference on driver unload.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---

 drivers/net/igb/igb_main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index f23a048..cfed2b0 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1372,7 +1372,8 @@ static void __devexit igb_remove(struct pci_dev *pdev)
 
 	unregister_netdev(netdev);
 
-	if (!igb_check_reset_block(&adapter->hw))
+	if (adapter->hw.phy.ops.reset_phy &&
+	    !igb_check_reset_block(&adapter->hw))
 		adapter->hw.phy.ops.reset_phy(&adapter->hw);
 
 	igb_remove_device(&adapter->hw);


  reply	other threads:[~2008-08-01 23:11 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-01 23:11 [PATCH 1/8] igb: fix comments Jeff Kirsher
2008-08-01 23:11 ` Jeff Kirsher [this message]
2008-08-01 23:11 ` [PATCH 3/8] igb: fixes 82576 serdes init to correctly support manual flow control changes Jeff Kirsher
2008-08-01 23:11 ` [PATCH 4/8] igb: fix 82576 register translation Jeff Kirsher
2008-08-01 23:11 ` [PATCH 5/8] igb: fix issue of set_mta member not being set Jeff Kirsher
2008-08-01 23:11 ` [PATCH 6/8] igb: remove two redundant functions Jeff Kirsher
2008-08-01 23:11 ` [PATCH 7/8] igb: remove igb_init_managability as it is deprecated Jeff Kirsher
2008-08-01 23:11 ` [PATCH 8/8] igb: remove 82576 quad adapter Jeff Kirsher

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=20080801231115.393.275.stgit@localhost.localdomain \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=alexander.h.duyck@intel.com \
    --cc=davem@davemloft.net \
    --cc=jeff@garzik.org \
    --cc=netdev@vger.kernel.org \
    /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