From patchwork Mon Aug 27 21:53:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaccon Bastiaansen X-Patchwork-Id: 180283 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 C5E9E2C00F6 for ; Tue, 28 Aug 2012 07:55:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754727Ab2H0Vye (ORCPT ); Mon, 27 Aug 2012 17:54:34 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:59889 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754594Ab2H0VyY (ORCPT ); Mon, 27 Aug 2012 17:54:24 -0400 Received: by weyx8 with SMTP id x8so2622240wey.19 for ; Mon, 27 Aug 2012 14:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=BvB7zxPvLWK3H7PuT6QJIpFzJl+trAm1ZJHfOaGYKoA=; b=enGJOHeIlQbH2A7Wz8n4O1O/lryX/YjDhuFKmFg+phZcau8g5xevEQharGgfJz1hiz n4NXCW6j+qeihlTBiLKyCgvpAWjZhNBRRXkbNawNVqDNfxdVcMiChEwDU+bkVMTTtbg7 tgCQndlBYm7+PAe/nSunZ9vM2vQ5RSdlIDJPOU67sV//p97xC46eNonhMeF2zx6DgPIK 3nZ2K5LzhizyLjwMPri1wKWOlUER+WfdeGuH2OV6apKZJS9rZiVHl/ebZtQmbrj/IS1c Ij0yAm9cWwXvMCI55YWlMw5FxDitcZZcZeBaaAAkrI2ddU25+hXJM0j1CWU9Y9gtGQbv EaZA== Received: by 10.180.102.136 with SMTP id fo8mr28246711wib.19.1346104462851; Mon, 27 Aug 2012 14:54:22 -0700 (PDT) Received: from localhost.localdomain (s529d540e.adsl.wanadoo.nl. [82.157.84.14]) by mx.google.com with ESMTPS id hv8sm17283830wib.0.2012.08.27.14.54.20 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Aug 2012 14:54:21 -0700 (PDT) From: Jaccon Bastiaansen To: joe@perches.com, davem@davemloft.net Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, Jaccon Bastiaansen Subject: [PATCH v2] cs89x0 : packet reception not working Date: Mon, 27 Aug 2012 23:53:51 +0200 Message-Id: <1346104431-3784-1-git-send-email-jaccon.bastiaansen@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The RxCFG register of the CS89x0 could be configured incorrectly (because of misplaced parentheses), resulting in the disabling of packet reception. Signed-off-by: Jaccon Bastiaansen --- drivers/net/ethernet/cirrus/cs89x0.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c index 845b202..1384469 100644 --- a/drivers/net/ethernet/cirrus/cs89x0.c +++ b/drivers/net/ethernet/cirrus/cs89x0.c @@ -1243,6 +1243,7 @@ static void set_multicast_list(struct net_device *dev) { struct net_local *lp = netdev_priv(dev); unsigned long flags; + u16 cfg; spin_lock_irqsave(&lp->lock, flags); if (dev->flags & IFF_PROMISC) @@ -1260,11 +1261,10 @@ static void set_multicast_list(struct net_device *dev) /* in promiscuous mode, we accept errored packets, * so we have to enable interrupts on them also */ - writereg(dev, PP_RxCFG, - (lp->curr_rx_cfg | - (lp->rx_mode == RX_ALL_ACCEPT) - ? (RX_CRC_ERROR_ENBL | RX_RUNT_ENBL | RX_EXTRA_DATA_ENBL) - : 0)); + cfg = lp->curr_rx_cfg; + if (lp->rx_mode == RX_ALL_ACCEPT) + cfg |= RX_CRC_ERROR_ENBL | RX_RUNT_ENBL | RX_EXTRA_DATA_ENBL; + writereg(dev, PP_RxCFG, cfg); spin_unlock_irqrestore(&lp->lock, flags); }