From patchwork Wed Dec 11 06:44:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 299818 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0CFDB2C0185 for ; Wed, 11 Dec 2013 17:44:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751252Ab3LKGo1 (ORCPT ); Wed, 11 Dec 2013 01:44:27 -0500 Received: from mail-ea0-f175.google.com ([209.85.215.175]:35623 "EHLO mail-ea0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751030Ab3LKGoY (ORCPT ); Wed, 11 Dec 2013 01:44:24 -0500 Received: by mail-ea0-f175.google.com with SMTP id z10so2659213ead.6 for ; Tue, 10 Dec 2013 22:44:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=yfu5D2mF/N4EHBY2XjGIhuh49ukMqt4OL1yWvBmX+nM=; b=wdxLL34tgKagqYzyJWtzwDhx1DYpOr5kDVK0YS73QHOpq7fta7Bi1ukL+VMS1iTaDw iQiinMLEPZ+SlpAYNXTbVZ6Igo2sxUPUGKxGWRersCESsrKLPvdFXr5N1mpZj5P7ZrtY Npsn59TBcYQPOSATk1cF3DAWbP5XkTC7CLYahMGS9qCggFE2BMRSDs2zvpvzCdmIKG97 uL/DyNYHnb0B6hO61eeqxTaiE6qQf2sE0racK+ApwztIkipJCNikOVxw2OqDYt4B35lM siucxq8uoVcuZkROkqu4zddctHwBsoDEQiIJKDQ2ZUXG/3pWxrzqlDgjLHP3VVw+LSM/ uHcg== X-Received: by 10.15.109.205 with SMTP id cf53mr15483262eeb.30.1386744263178; Tue, 10 Dec 2013 22:44:23 -0800 (PST) Received: from linux-samsung700g7a.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by mx.google.com with ESMTPSA id 1sm49800662eeg.4.2013.12.10.22.44.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Dec 2013 22:44:22 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: netdev@vger.kernel.org, "David S. Miller" Cc: Hauke Mehrtens , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH net-next] bgmac: reset cached MAC state during chip reset Date: Wed, 11 Dec 2013 07:44:14 +0100 Message-Id: <1386744254-32408-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Without this bgmac_adjust_link didn't know it should re-initialize MAC state. This led to the MAC not working after if down & up routine. Signed-off-by: Rafał Miłecki --- drivers/net/ethernet/broadcom/bgmac.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index 055204e..5b5ac71 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -951,6 +951,8 @@ static void bgmac_chip_reset(struct bgmac *bgmac) BGMAC_CMDCFG_CFE | BGMAC_CMDCFG_SR, false); + bgmac->mac_speed = SPEED_UNKNOWN; + bgmac->mac_duplex = DUPLEX_UNKNOWN; bgmac_clear_mib(bgmac); if (core->id.id == BCMA_CORE_4706_MAC_GBIT)