From patchwork Wed Aug 12 00:41:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jakub_Kici=C5=84ski?= X-Patchwork-Id: 506276 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 B58AF14018C for ; Wed, 12 Aug 2015 10:42:19 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=wp.pl header.i=@wp.pl header.b=VDL4bshc; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933241AbbHLAmG (ORCPT ); Tue, 11 Aug 2015 20:42:06 -0400 Received: from mx4.wp.pl ([212.77.101.11]:25494 "EHLO mx4.wp.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932962AbbHLAmE (ORCPT ); Tue, 11 Aug 2015 20:42:04 -0400 Received: (wp-smtpd smtp.wp.pl 8279 invoked from network); 12 Aug 2015 02:42:01 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wp.pl; s=1024a; t=1439340122; bh=yMoSXY6nlSxDE/1bc8rrQLooKHrtpZublxNKxGxnpu0=; h=From:To:Cc:Subject; b=VDL4bshcb56+aVciS0h1zESLtCNJBoo2SSlYG3dezepXTKeWJ5bzQ+9+iTYs/Z6YW mOk0o4WJ/ZV6YSpYSDvUTG7QwzM82SDFZZXUFuoIe8PmNgcj5MWRqO1xBksUzZJJi6 qDLirga9iencPjrP/FcYM2+9dho8k3xXkx1brl1Y= Received: from 89-69-164-220.dynamic.chello.pl (HELO north.moorray.no-ip.org) (moorray3@[89.69.164.220]) (envelope-sender ) by smtp.wp.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 12 Aug 2015 02:42:01 +0200 Received: by north.moorray.no-ip.org (sSMTP sendmail emulation); Wed, 12 Aug 2015 02:42:01 +0200 From: Jakub Kicinski To: "David S. Miller" , Claudiu Manoil Cc: netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCHv2 1/3] gianfar: correct filer table writing Date: Wed, 12 Aug 2015 02:41:55 +0200 Message-Id: <1439340117-25314-2-git-send-email-moorray3@wp.pl> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1439340117-25314-1-git-send-email-moorray3@wp.pl> References: <1439237540-11302-1-git-send-email-moorray3@wp.pl> <1439340117-25314-1-git-send-email-moorray3@wp.pl> X-WP-DKIM-Status: good (id: wp.pl) X-WP-MailID: 689734e388b80b70134eba7d98754afd X-WP-AV: skaner antywirusowy poczty Wirtualnej Polski S. A. X-WP-SPAM: NO 0000000 [sWNU] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jakub Kicinski MAX_FILER_IDX is the last usable index. Using less-than will already guarantee that one entry for catch-all rule will be left, no need to subtract 1 here. Signed-off-by: Jakub Kicinski --- v2: no change --- drivers/net/ethernet/freescale/gianfar_ethtool.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c index 555e461b0cfe..e543d3b01838 100644 --- a/drivers/net/ethernet/freescale/gianfar_ethtool.c +++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c @@ -1585,11 +1585,10 @@ static int gfar_write_filer_table(struct gfar_private *priv, return -EBUSY; /* Fill regular entries */ - for (; i < MAX_FILER_IDX - 1 && (tab->fe[i].ctrl | tab->fe[i].prop); - i++) + for (; i < MAX_FILER_IDX && (tab->fe[i].ctrl | tab->fe[i].prop); i++) gfar_write_filer(priv, i, tab->fe[i].ctrl, tab->fe[i].prop); /* Fill the rest with fall-troughs */ - for (; i < MAX_FILER_IDX - 1; i++) + for (; i < MAX_FILER_IDX; i++) gfar_write_filer(priv, i, 0x60, 0xFFFFFFFF); /* Last entry must be default accept * because that's what people expect