From patchwork Thu Aug 26 22:15:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernard Pidoux X-Patchwork-Id: 62810 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 8D65BB70DD for ; Fri, 27 Aug 2010 08:17:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754185Ab0HZWRx (ORCPT ); Thu, 26 Aug 2010 18:17:53 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:55550 "EHLO smtp5-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753836Ab0HZWRw (ORCPT ); Thu, 26 Aug 2010 18:17:52 -0400 Received: from [192.168.0.14] (unknown [81.56.166.101]) by smtp5-g21.free.fr (Postfix) with ESMTP id A304CD48024; Fri, 27 Aug 2010 00:17:44 +0200 (CEST) Message-ID: <4C76E765.9020201@free.fr> Date: Fri, 27 Aug 2010 00:15:01 +0200 From: Bernard F6BVP User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.10) Gecko/20100628 Mandriva/3.0.5-1mdv2010.1 (2010.1) Thunderbird/3.0.5 MIME-Version: 1.0 To: ralf@linux-mips.org CC: davem@davemloft.net, linux-hams@vger.kernel.org, netdev@vger.kernel.org, bpidoux@free.fr Subject: [PATCH] [ROSE] rose node number was never decreased Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When a ROSE node was deleted, node number was not decremented and addr kept going up when a new node was added. /proc/net/rose_neigh addr callsign dev count use mode restart t0 tf digipeaters 00007 F5KBW-9 ax0 1 0 DTE no 0 0 00006 F6BVP-11 ax0 2 0 DTE no 0 0 00005 F6BVP-9 ax0 2 0 DTE no 0 0 00001 RSLOOP-0 ??? 0 0 DCE yes 0 0 With this patch, rose node number is correctly decreased when nodes are deleted and new ones added : /proc/net/rose_neigh addr callsign dev count use mode restart t0 tf digipeaters 00004 F5KBW-9 ax0 1 0 DTE no 0 0 00003 F6BVP-11 ax0 2 0 DTE no 0 0 00002 F6BVP-9 ax0 2 0 DTE no 0 0 00001 RSLOOP-0 ??? 0 0 DCE yes 0 0 Signed-off-by: Bernard Pidoux --- a/net/rose/rose_route.c 2010-08-13 22:44:56.000000000 +0200 +++ b/net/rose/rose_route.c 2010-08-26 15:11:13.000000000 +0200 @@ -240,6 +240,7 @@ ax25_cb_put(rose_neigh->ax25); kfree(rose_neigh->digipeat); kfree(rose_neigh); + rose_neigh_no--; return; } @@ -250,6 +251,7 @@ ax25_cb_put(rose_neigh->ax25); kfree(rose_neigh->digipeat); kfree(rose_neigh); + rose_neigh_no--; return; }