From patchwork Mon Nov 21 22:53:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 1399 Return-Path: Received: from confino.investici.org (investici.nine.ch [217.150.252.179]) by open-mesh.org (Postfix) with ESMTPS id AB962600853 for ; Mon, 21 Nov 2011 23:53:31 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@autistici.org; dkim-adsp=pass Received: from [217.150.252.179] (confino [217.150.252.179]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 06D50C8650; Mon, 21 Nov 2011 22:53:30 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 confino.investici.org 06D50C8650 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1321916011; bh=r8oPiRa8VeJmzMQB2e5vSLAOH4UdiLCsWEO7HF80nsE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=YsniSeYJF/v81GRLbNLn+YcRPljTFDahfyqYdqrkKIOuGO/1dwLjyp6fIH66fiMx8 XU8x1tokfM2gbLUr+7wJOUgZ1avF4tmCnEPMpByjhEwwJXLC8LcWgMNEYXYs06WBoS RGS14IohacyYRc9MJHO19cHhVK9k7aLPib5j4AsY= From: Antonio Quartulli To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 21 Nov 2011 23:53:12 +0100 Message-Id: <1321915993-29312-7-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1321915993-29312-1-git-send-email-ordex@autistici.org> References: <1321915993-29312-1-git-send-email-ordex@autistici.org> Subject: [B.A.T.M.A.N.] [PATCHv3 6/7] batman-adv: Distributed ARP Table - increase default soft_iface ARP table timeout X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Nov 2011 22:53:31 -0000 The default timeout value for ARP entries belonging to any soft_iface ARP table has been incremented by a factor 4. This is necessary because the DHT will store several network entries in the soft_iface ARP table. Signed-off-by: Antonio Quartulli Reviewed-by: Simon Wunderlich --- main.h | 4 ++++ soft-interface.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/main.h b/main.h index 2b1c4b4..6216abd 100644 --- a/main.h +++ b/main.h @@ -69,6 +69,10 @@ /* numbers of originator to contact for any STORE/GET DHT operation */ #define DHT_CANDIDATES_NUM 3 +/* Factor which default ARP timeout values of the soft_iface table are + * multiplied by */ +#define ARP_TIMEOUT_FACTOR 4 + #define NUM_WORDS (TQ_LOCAL_WINDOW_SIZE / WORD_BIT_SIZE) #define LOG_BUF_LEN 8192 /* has to be a power of 2 */ diff --git a/soft-interface.c b/soft-interface.c index 5ef9bba..786bc71 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -36,6 +36,7 @@ #include #include #include +#include #include "unicast.h" @@ -834,6 +835,7 @@ static void interface_setup(struct net_device *dev) struct net_device *softif_create(const char *name) { struct net_device *soft_iface; + struct in_device *in_dev; struct bat_priv *bat_priv; int ret; @@ -849,6 +851,21 @@ struct net_device *softif_create(const char *name) goto free_soft_iface; } + in_dev = in_dev_get(soft_iface); + if (!in_dev) { + pr_err("Unable to set ARP parameters for the batman interface " + "'%s'\n", name); + goto free_soft_iface; + } + + /* Introduce a delay in the ARP state-machine transactions. Entries + * will be kept in the ARP table for the default time multiplied by 4 */ + in_dev->arp_parms->base_reachable_time *= ARP_TIMEOUT_FACTOR; + in_dev->arp_parms->gc_staletime *= ARP_TIMEOUT_FACTOR; + in_dev->arp_parms->reachable_time *= ARP_TIMEOUT_FACTOR; + + in_dev_put(in_dev); + bat_priv = netdev_priv(soft_iface); atomic_set(&bat_priv->aggregated_ogms, 1);