From patchwork Tue Aug 12 13:00:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chas williams - CONTRACTOR X-Patchwork-Id: 379326 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 9B7DE1400AA for ; Tue, 12 Aug 2014 23:01:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751727AbaHLNA6 (ORCPT ); Tue, 12 Aug 2014 09:00:58 -0400 Received: from hedwig.cmf.nrl.navy.mil ([134.207.12.162]:33437 "EHLO hedwig.cmf.nrl.navy.mil" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751500AbaHLNA5 (ORCPT ); Tue, 12 Aug 2014 09:00:57 -0400 Received: from thirdoffive.cmf.nrl.navy.mil ([IPv6:2001:480:23:c:2e0:81ff:fe78:9314]) by hedwig.cmf.nrl.navy.mil (8.14.2/8.14.2) with ESMTP id s7CD0bR8007627 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 12 Aug 2014 09:00:38 -0400 Received: from cmf.nrl.navy.mil (localhost [127.0.0.1]) by thirdoffive.cmf.nrl.navy.mil (8.14.7/8.14.4) with ESMTP id s7CD0bC0009030; Tue, 12 Aug 2014 09:00:37 -0400 Received: (from chas@localhost) by cmf.nrl.navy.mil (8.14.7/8.14.4/Submit) id s7CD0aJ6009027; Tue, 12 Aug 2014 09:00:36 -0400 Date: Tue, 12 Aug 2014 09:00:36 -0400 From: chas williams - CONTRACTOR Cc: netdev@vger.kernel.org, linux-atm-general@lists.sourceforge.net Subject: [PATCH] lec: Fix bug introduced by b67bfe0d42cac56c512dd5da4b1b347a23f4b70a Message-ID: <20140812090036.5e4530ad@thirdoffive.cmf.nrl.navy.mil> In-Reply-To: <53EA09DC.5070909@cogentembedded.com> References: <201408121224.s7CCOKCk008781@thirdoffive.cmf.nrl.navy.mil> <53EA09DC.5070909@cogentembedded.com> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-NRLCMF-Spam-Score: (*) hits=1.206 X-NRLCMF-Virus-Scanned: No virus found X-Scanned-By: MIMEDefang 2.68 on IPv6:2001:480:23:c::13 To: unlisted-recipients:; (no To-header on input) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org b67bfe0d42cac56c512dd5da4b1b347a23f4b70a (hlist: drop the node parameter from iterators) dropped the node parameter from iterators which lec_tbl_walk() was using to iterate the list. Signed-off-by: Chas Williams --- net/atm/lec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net/atm/lec.c b/net/atm/lec.c index 4c5b8ba..e4853b5 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -833,7 +833,6 @@ static void *lec_tbl_walk(struct lec_state *state, struct hlist_head *tbl, loff_t *l) { struct hlist_node *e = state->node; - struct lec_arp_table *tmp; if (!e) e = tbl->first; @@ -842,9 +841,7 @@ static void *lec_tbl_walk(struct lec_state *state, struct hlist_head *tbl, --*l; } - tmp = container_of(e, struct lec_arp_table, next); - - hlist_for_each_entry_from(tmp, next) { + for (; e; e = e->next) { if (--*l < 0) break; }