From patchwork Tue Feb 7 09:20:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1506 Return-Path: Received: from nm25-vm5.bullet.mail.ukl.yahoo.com (nm25-vm5.bullet.mail.ukl.yahoo.com [217.146.177.125]) by open-mesh.org (Postfix) with SMTP id 88866600881 for ; Tue, 7 Feb 2012 10:21:20 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.184] by nm25.bullet.mail.ukl.yahoo.com with NNFMP; 07 Feb 2012 09:21:20 -0000 Received: from [77.238.184.67] by tm15.bullet.mail.ukl.yahoo.com with NNFMP; 07 Feb 2012 09:21:20 -0000 Received: from [127.0.0.1] by smtp136.mail.ukl.yahoo.com with NNFMP; 07 Feb 2012 09:21:20 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1328606480; bh=ipGTWJzs9j9663+3ByC/kYCHC62qpw/rw5Ds8nJDjEI=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=QHFj66WfDKSPHVK4+Rj+cDR5Ti9VSJNdpbnCfzxerArsuESPNPuSImitgdDA4AjRtpzoRZWUJYtorQCjt0SGzGu9HN2OnTzpz2E8caOwyLD+hgQJosy/exyZ0TjcyU5u0YReWRXuDVWvzPzMgQCWX14rtItPm1auHzpKJOXIf5k= X-Yahoo-Newman-Id: 178917.10464.bm@smtp136.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 4MX4oz8VM1m2GCfaBQRnKPyFy.xH8V8J6YuYCTGQ58umaVP RlS06GMt.KljDL4e.D5PJ.fskuA692RJkzSE2jYE8FZtLQPHypIfRbXd9rby Tdh_1l9xxlBeMTcaaOpaUxygCUHOQap1MPYPbpmiuGTfSTA6jsTxcv1EYJ1w 240mpNtlC7mnA0CxgHAeXK1.hfYQemv2jvjXT9CRoiRjFeULFp1ThwhjKFZR 5NVotfKbnc.8SG8Fy_6ZViYBQGEIE7NqRT9wHlvIxV3g75t.2xCQ0bKPSpN_ K_ViS_mWhlBTxEVFaqwOaUWahzJPIpXGah1IrUw4kjrAvFviArV2PbPBTIiM j.pSGsfR1CnhVSONBMQ_gN1Db.fTasdSMGY4rMSwXOGojnnt8OZeKgwvKSva _jQ-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp136.mail.ukl.yahoo.com with SMTP; 07 Feb 2012 09:21:19 +0000 GMT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Tue, 7 Feb 2012 17:20:48 +0800 Message-Id: <1328606451-3418-4-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1328606451-3418-1-git-send-email-lindner_marek@yahoo.de> References: <201202071719.22804.lindner_marek@yahoo.de> <1328606451-3418-1-git-send-email-lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 5/8] batman-adv: handle routing code initialization properly 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: Tue, 07 Feb 2012 09:21:20 -0000 Signed-off-by: Marek Lindner --- bat_iv_ogm.c | 11 ++++++++++- hard-interface.c | 14 ++++++-------- types.h | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 98c41f5..d944a0b 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -30,10 +30,11 @@ #include "send.h" #include "bat_algo.h" -static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) +static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; unsigned long random_seqno; + int res = -1; /* randomize initial seqno to avoid collision */ get_random_bytes(&random_seqno, sizeof(unsigned long)); @@ -42,6 +43,9 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) hard_iface->packet_len = BATMAN_OGM_LEN; hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC); + if (!hard_iface->packet_buff) + goto out; + batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff; batman_ogm_packet->header.packet_type = BAT_OGM; batman_ogm_packet->header.version = COMPAT_VERSION; @@ -50,6 +54,11 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) batman_ogm_packet->tq = TQ_MAX_VALUE; batman_ogm_packet->tt_num_changes = 0; batman_ogm_packet->ttvn = 0; + + res = 0; + +out: + return res; } static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface) diff --git a/hard-interface.c b/hard-interface.c index ec2f478..d6b25e0 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -310,21 +310,17 @@ int hardif_enable_interface(struct hard_iface *hard_iface, pr_err("Can't create batman mesh interface %s: " "already exists as regular interface\n", soft_iface->name); - dev_put(soft_iface); ret = -EINVAL; - goto err; + goto err_dev; } hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); - bat_priv->bat_algo_ops->bat_iface_enable(hard_iface); - - if (!hard_iface->packet_buff) { - bat_err(hard_iface->soft_iface, "Can't add interface packet " - "(%s): out of memory\n", hard_iface->net_dev->name); + ret = bat_priv->bat_algo_ops->bat_iface_enable(hard_iface); + if (ret < 0) { ret = -ENOMEM; - goto err; + goto err_dev; } hard_iface->if_num = bat_priv->num_ifaces; @@ -375,6 +371,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface, out: return 0; +err_dev: + dev_put(soft_iface); err: hardif_free_ref(hard_iface); return ret; diff --git a/types.h b/types.h index 5e8de0e..3df38df 100644 --- a/types.h +++ b/types.h @@ -370,7 +370,7 @@ struct bat_algo_ops { struct hlist_node list; char *name; /* init routing info when hard-interface is enabled */ - void (*bat_iface_enable)(struct hard_iface *hard_iface); + int (*bat_iface_enable)(struct hard_iface *hard_iface); /* de-init routing info when hard-interface is disabled */ void (*bat_iface_disable)(struct hard_iface *hard_iface); /* init primary OGM when primary interface is selected */