Return-Path: X-Original-To: roc@mail.canonical.com Delivered-To: roc@mail.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by grenadilla.canonical.com (Postfix) with ESMTP id 1B9FA1472859 for ; Tue, 4 May 2010 15:32:31 +0100 (BST) Received: from cluster-j.mailcontrol.com (cluster-j.mailcontrol.com [85.115.54.190]) by fiordland.canonical.com (Postfix) with ESMTP id EF6EBA18861; Tue, 4 May 2010 15:32:30 +0100 (BST) Received: from arctowski.canonical.com (arctowski.canonical.com [91.189.94.158]) by rly55j.srv.mailcontrol.com (MailControl) with ESMTP id o44EWPSA029058; Tue, 4 May 2010 15:32:27 +0100 Received: from fiordland.canonical.com ([91.189.94.145]) by arctowski.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O9JAf-0004ic-Eq; Tue, 04 May 2010 15:32:25 +0100 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by fiordland.canonical.com (Postfix) with ESMTP id 1CAE2A18870; Tue, 4 May 2010 15:32:25 +0100 (BST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759936Ab0EDObg (ORCPT + 2 others); Tue, 4 May 2010 10:31:36 -0400 Received: from mail13.aspcenter.se ([194.29.119.16]:1410 "EHLO mail13.aspcenter.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759909Ab0EDObf (ORCPT ); Tue, 4 May 2010 10:31:35 -0400 X-Greylist: delayed 901 seconds by postgrey-1.27 at vger.kernel.org; Tue, 04 May 2010 10:31:34 EDT Received: from mail.rd.westermo.se (Not Verified[213.132.98.37]) by mail13.aspcenter.se with MailMarshal (v6,7,2,8378) id ; Tue, 04 May 2010 16:16:33 +0200 X-MDAV-Processed: mail.rd.westermo.se, Tue, 04 May 2010 16:16:31 +0200 Received: from [192.168.131.142] by rd.westermo.se (MDaemon PRO v10.1.2) with ESMTP id 50-md50000011854.msg for ; Tue, 04 May 2010 16:16:31 +0200 X-Spam-Processed: mail.rd.westermo.se, Tue, 04 May 2010 16:16:31 +0200 (not processed: message from trusted or authenticated source) X-Authenticated-Sender: mattias.walstrom@westermo.se X-MDRemoteIP: 192.168.131.142 X-Return-Path: mattias@vmlinux.org X-Envelope-From: mattias@vmlinux.org X-MDaemon-Deliver-To: netdev@vger.kernel.org Message-ID: <4BE02C3E.2000705@vmlinux.org> Date: Tue, 04 May 2010 16:16:30 +0200 From: Mattias Walstrom User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9) Gecko/20100414 Thunderbird/3.0.4 MIME-Version: 1.0 To: netdev@vger.kernel.org Subject: [PATCH] FEC: Fix kernel panic in fec_set_mac_address. Content-Type: text/plain; charset=ISO-8859-1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Content-Transfer-Encoding: quoted-printable X-Mailcontrol-Inbound: uq3drnD2P+ps5SfEb0fvr78+NoP1DHBZwGqKpaXB2eTgNv8D6KLIxb8+NoP1DHBZ8VSaBg0k0xw= X-Spam-Score: -1.364 X-Scanned-By: MailControl A_09_40_00 (www.mailcontrol.com) on 10.74.0.165 Fix memory corruption that sometimes result in kernel panic. Signed-off-by: Mattias Walstr=F6m fec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 9f98c1c..9b4e8f7 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -1653,7 +1653,7 @@ fec_set_mac_address(struct net_device *dev, void *p= ) (dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24), fep->hwp + FEC_ADDR_LOW); writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24), - fep + FEC_ADDR_HIGH); + fep->hwp + FEC_ADDR_HIGH); return 0; } =20 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html