summaryrefslogtreecommitdiff
path: root/net/batman-adv/packet.h
diff options
context:
space:
mode:
authorMarek Lindner <lindner_marek@yahoo.de>2012-02-07 17:20:51 +0800
committerAntonio Quartulli <ordex@autistici.org>2012-04-18 09:54:01 +0200
commit1eeb479fda2405269b3a85c86ba0eca41fcc4ea0 (patch)
tree99ac9b9b73c2bd1b49858f5cd39dc1d27a3a8a24 /net/batman-adv/packet.h
parent76e3d7fc1a49ea8c377ddc91a4ec40f326404833 (diff)
downloadlinux-3.10-1eeb479fda2405269b3a85c86ba0eca41fcc4ea0.tar.gz
linux-3.10-1eeb479fda2405269b3a85c86ba0eca41fcc4ea0.tar.bz2
linux-3.10-1eeb479fda2405269b3a85c86ba0eca41fcc4ea0.zip
batman-adv: mark existing ogm variables as batman iv
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> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Diffstat (limited to 'net/batman-adv/packet.h')
-rw-r--r--net/batman-adv/packet.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index 59dec0a1979..f54969c61a1 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/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