Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935560AbXEUTx2 (ORCPT ); Mon, 21 May 2007 15:53:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1765079AbXEUT3n (ORCPT ); Mon, 21 May 2007 15:29:43 -0400 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:52686 "EHLO sous-sol.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934124AbXEUT3m (ORCPT ); Mon, 21 May 2007 15:29:42 -0400 Message-Id: <20070521191721.927168000@sous-sol.org> References: <20070521191612.800400000@sous-sol.org> User-Agent: quilt/0.46-1 Date: Mon, 21 May 2007 12:16:37 -0700 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, "Michael Chan" , David S Miller Subject: [patch 25/69] BNX2: Block MII access when ifdown. Content-Disposition: inline; filename=bnx2-block-mii-access-when-ifdown.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1342 Lines: 46 -stable review patch. If anyone has any objections, please let us know. --------------------- From: The device may be in D3hot state and should not allow MII register access. Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Chris Wright --- --- drivers/net/bnx2.c | 6 ++++++ 1 file changed, 6 insertions(+) --- linux-2.6.21.1.orig/drivers/net/bnx2.c +++ linux-2.6.21.1/drivers/net/bnx2.c @@ -5564,6 +5564,9 @@ bnx2_ioctl(struct net_device *dev, struc case SIOCGMIIREG: { u32 mii_regval; + if (!netif_running(dev)) + return -EAGAIN; + spin_lock_bh(&bp->phy_lock); err = bnx2_read_phy(bp, data->reg_num & 0x1f, &mii_regval); spin_unlock_bh(&bp->phy_lock); @@ -5577,6 +5580,9 @@ bnx2_ioctl(struct net_device *dev, struc if (!capable(CAP_NET_ADMIN)) return -EPERM; + if (!netif_running(dev)) + return -EAGAIN; + spin_lock_bh(&bp->phy_lock); err = bnx2_write_phy(bp, data->reg_num & 0x1f, data->val_in); spin_unlock_bh(&bp->phy_lock); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/