netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Frank Li <Frank.Li@freescale.com>
To: <lznuaa@gmail.com>, <shawn.guo@linaro.org>,
	<B38611@freescale.com>, <davem@davemloft.net>,
	<rmk+kernel@arm.linux.org.uk>
Cc: <linux-arm-kernel@lists.infradead.org>, <netdev@vger.kernel.org>,
	Frank Li <Frank.Li@freescale.com>
Subject: [PATCH net-next 4/7] net:fec: ensure that a disconnected phy isn't configured
Date: Tue, 29 Apr 2014 20:09:07 +0800	[thread overview]
Message-ID: <1398773350-7293-4-git-send-email-Frank.Li@freescale.com> (raw)
In-Reply-To: <1398773350-7293-1-git-send-email-Frank.Li@freescale.com>

From: Russell King <rmk+kernel@arm.linux.org.uk>

When we disconnect from a phy, we should forget our pointer to it so we
don't accidentally try to configure it.  We handle a NULL phy pointer
correctly in most places, except fec_enet_set_pauseparam().  Fix this
too.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Frank Li <Frank.Li@freescale.com>
---
 drivers/net/ethernet/freescale/fec_main.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index b7a5614..9de899e 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1496,6 +1496,9 @@ static int fec_enet_set_pauseparam(struct net_device *ndev,
 {
 	struct fec_enet_private *fep = netdev_priv(ndev);
 
+	if (!fep->phy_dev)
+		return -ENODEV;
+
 	if (pause->tx_pause != pause->rx_pause) {
 		netdev_info(ndev,
 			"hardware only support enable/disable both tx and rx");
@@ -1800,6 +1803,7 @@ fec_enet_close(struct net_device *ndev)
 
 	phy_stop(fep->phy_dev);
 	phy_disconnect(fep->phy_dev);
+	fep->phy_dev = NULL;
 
 	fec_enet_free_buffers(ndev);
 
-- 
1.7.8

  parent reply	other threads:[~2014-04-29 13:35 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-29 12:09 [PATCH net-next 1/7] net:fec: remove unnecessary ip stack includes Frank Li
2014-04-29 12:09 ` [PATCH net-next 2/7] net:fec: reorder ethtool ops to match order in struct declaration Frank Li
2014-04-29 12:09 ` [PATCH net-next 3/7] net:fec: remove checking for NULL phy_dev in fec_enet_close() Frank Li
2014-04-29 12:09 ` Frank Li [this message]
2014-04-29 12:09 ` [PATCH net-next 5/7] net:fec: add support for dumping transmit ring on timeout Frank Li
2014-04-29 13:38   ` David Laight
2014-04-29 13:57     ` Frank Li
2014-04-29 14:01       ` David Laight
2014-04-29 14:15         ` Russell King - ARM Linux
2014-04-29 14:22           ` Frank Li
2014-04-29 14:30             ` Frank Li
2014-04-29 14:32             ` Russell King - ARM Linux
2014-04-29 14:54               ` Frank Li
2014-04-29 15:04                 ` Russell King - ARM Linux
2014-04-29 15:11                   ` Frank Li
2014-04-30  6:22                     ` Shawn Guo
2014-04-29 14:18         ` Frank Li
2014-04-29 14:23           ` David Laight
2014-04-29 14:38             ` Russell King - ARM Linux
2014-05-29  8:17               ` fugang.duan
2014-05-30  0:03                 ` Russell King - ARM Linux
2014-05-30  1:51                   ` fugang.duan
2014-04-29 12:09 ` [PATCH net-next 6/7] net:fec: use netif_tx_disable() rather than netif_stop_queue() Frank Li
2014-04-29 12:09 ` [PATCH net-next 7/7] net:fec: iMX6 FEC does not support half-duplex gigabit Frank Li

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=1398773350-7293-4-git-send-email-Frank.Li@freescale.com \
    --to=frank.li@freescale.com \
    --cc=B38611@freescale.com \
    --cc=davem@davemloft.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=lznuaa@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=shawn.guo@linaro.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;
as well as URLs for NNTP newsgroup(s).