diff mbox

[8/8] batman-adv: mark existing ogm variables as batman iv

Message ID 1328606451-3418-7-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Accepted, archived
Commit fc320c7fe95be4e5e14b0dce4e438112a6b41cf5
Headers

Commit Message

Marek Lindner Feb. 7, 2012, 9:20 a.m. UTC 
  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 <lindner_marek@yahoo.de>
---
 bat_iv_ogm.c     |    4 ++--
 hard-interface.c |    2 +-
 packet.h         |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Comments

Marek Lindner Feb. 12, 2012, 3:11 p.m. UTC | #1 
On Tuesday, February 07, 2012 17:20:51 Marek Lindner wrote:
> The coming protocol changes also will have a part called "OGM". That
> makes it necessary to introduce a distinction in the code base.

Applied in revision fc320c7.

Regards,
Marek
diff mbox

Patch

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