From patchwork Tue Feb 7 09:20:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1530 Return-Path: Received: from nm11.bullet.mail.ukl.yahoo.com (nm11.bullet.mail.ukl.yahoo.com [217.146.183.185]) by open-mesh.org (Postfix) with SMTP id C3819600857 for ; Tue, 7 Feb 2012 10:21:39 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.216] by nm11.bullet.mail.ukl.yahoo.com with NNFMP; 07 Feb 2012 09:21:39 -0000 Received: from [77.238.184.64] by tm9.bullet.mail.ukl.yahoo.com with NNFMP; 07 Feb 2012 09:21:39 -0000 Received: from [127.0.0.1] by smtp133.mail.ukl.yahoo.com with NNFMP; 07 Feb 2012 09:21:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1328606499; bh=+lnz7Auq45whnHT5z1nlPuGRZQN5M1PDbDzZ/vT8vy0=; 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=yxm634UTicJaiM2adWK1ohW979qjiPdTgFYhWk6VTDeFsh8SxkUKoT7iII6FoinRsVushqg9NCL03vxN3kXtSBF8sE9LnMVZzT3wsuR6FrxmNTi57sjWUO7q/tpmnfhS9CWtpi+JFrknO6TqnEVsfUyhICuKusC0Verzus+qkHk= X-Yahoo-Newman-Id: 619532.28824.bm@smtp133.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: c3MffMkVM1mvHsKHN2l4_.Mw67Rnmf_oLOsJAcSBPqrOG6W .Po3F3qxP7e2a8rTiz.2J0RMq7tEJihVSuvMDZnuRtEFVgHPsq79_GzPz6U1 jSXAOryYDHZHgbFqtOmwHWGfONksGskaiHCC5ejzicCttM_wmUjOJAoQb.wg kDpp6ygN5vrOHQSER197tzVqls9H7akuJhVuAMD.NSRt.NQKAwEIOo6br9Op 4T.g4lz4z55SBkDglE6CUhN03h9au2dIiA4m2X1RyI5OwnOJcJjbCiy81cv7 oBbLAs6UeJcsZnmyJASxpw1BsQ896ANLkhvgDi_Ijf33W7rR_tWqdhWt__jJ wFbdoxm0Rw3xkbWLdCQCUYmiFpt_2w2MqbSidrL8GL4aGJfzkBQyVRYOgeCR R0Q-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp133.mail.ukl.yahoo.com with SMTP; 07 Feb 2012 09:21:38 +0000 GMT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Tue, 7 Feb 2012 17:20:51 +0800 Message-Id: <1328606451-3418-7-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 8/8] batman-adv: mark existing ogm variables as batman iv 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:40 -0000 The coming protocol changes also will have a part called "OGM". That makes it necessary to introduce a distinction in the code base. Signed-off-by: Marek Lindner --- bat_iv_ogm.c | 4 ++-- hard-interface.c | 2 +- packet.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index da93525..caa67e4 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -47,7 +47,7 @@ static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) 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.packet_type = BAT_IV_OGM; batman_ogm_packet->header.version = COMPAT_VERSION; batman_ogm_packet->header.ttl = 2; batman_ogm_packet->flags = NO_FLAGS; @@ -942,7 +942,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, * packet in an aggregation. Here we expect that the padding * is always zero (or not 0x01) */ - if (batman_ogm_packet->header.packet_type != BAT_OGM) + if (batman_ogm_packet->header.packet_type != BAT_IV_OGM) return; /* could be changed by schedule_own_packet() */ diff --git a/hard-interface.c b/hard-interface.c index 2a435ec..30b1c07 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -617,7 +617,7 @@ static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, switch (batman_ogm_packet->header.packet_type) { /* batman originator packet */ - case BAT_OGM: + case BAT_IV_OGM: ret = recv_bat_ogm_packet(skb, hard_iface); break; diff --git a/packet.h b/packet.h index ed16ec3..7971a69 100644 --- a/packet.h +++ b/packet.h @@ -25,7 +25,7 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_OGM = 0x01, + BAT_IV_OGM = 0x01, BAT_ICMP = 0x02, BAT_UNICAST = 0x03, BAT_BCAST = 0x04, @@ -38,7 +38,7 @@ enum bat_packettype { /* this file is included by batctl which needs these defines */ #define COMPAT_VERSION 14 -enum batman_flags { +enum batman_iv_flags { PRIMARIES_FIRST_HOP = 1 << 4, VIS_SERVER = 1 << 5, DIRECTLINK = 1 << 6