summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/packet.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/packet.h')
-rw-r--r--net/batman-adv/packet.h21
1 files changed, 1 insertions, 20 deletions
diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index ab3084f4f8ff..87fcf2e7883c 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -29,7 +29,6 @@ enum batadv_packettype {
29 BATADV_ICMP = 0x02, 29 BATADV_ICMP = 0x02,
30 BATADV_UNICAST = 0x03, 30 BATADV_UNICAST = 0x03,
31 BATADV_BCAST = 0x04, 31 BATADV_BCAST = 0x04,
32 BATADV_VIS = 0x05,
33 BATADV_UNICAST_FRAG = 0x06, 32 BATADV_UNICAST_FRAG = 0x06,
34 BATADV_UNICAST_4ADDR = 0x09, 33 BATADV_UNICAST_4ADDR = 0x09,
35 BATADV_CODED = 0x0a, 34 BATADV_CODED = 0x0a,
@@ -56,7 +55,6 @@ enum batadv_subtype {
56enum batadv_iv_flags { 55enum batadv_iv_flags {
57 BATADV_NOT_BEST_NEXT_HOP = BIT(3), 56 BATADV_NOT_BEST_NEXT_HOP = BIT(3),
58 BATADV_PRIMARIES_FIRST_HOP = BIT(4), 57 BATADV_PRIMARIES_FIRST_HOP = BIT(4),
59 BATADV_VIS_SERVER = BIT(5),
60 BATADV_DIRECTLINK = BIT(6), 58 BATADV_DIRECTLINK = BIT(6),
61}; 59};
62 60
@@ -69,12 +67,6 @@ enum batadv_icmp_packettype {
69 BATADV_PARAMETER_PROBLEM = 12, 67 BATADV_PARAMETER_PROBLEM = 12,
70}; 68};
71 69
72/* vis defines */
73enum batadv_vis_packettype {
74 BATADV_VIS_TYPE_SERVER_SYNC = 0,
75 BATADV_VIS_TYPE_CLIENT_UPDATE = 1,
76};
77
78/* fragmentation defines */ 70/* fragmentation defines */
79enum batadv_unicast_frag_flags { 71enum batadv_unicast_frag_flags {
80 BATADV_UNI_FRAG_HEAD = BIT(0), 72 BATADV_UNI_FRAG_HEAD = BIT(0),
@@ -161,7 +153,7 @@ struct batadv_header {
161 */ 153 */
162struct batadv_ogm_packet { 154struct batadv_ogm_packet {
163 struct batadv_header header; 155 struct batadv_header header;
164 uint8_t flags; /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */ 156 uint8_t flags; /* 0x40: DIRECTLINK flag ... */
165 __be32 seqno; 157 __be32 seqno;
166 uint8_t orig[ETH_ALEN]; 158 uint8_t orig[ETH_ALEN];
167 uint8_t prev_sender[ETH_ALEN]; 159 uint8_t prev_sender[ETH_ALEN];
@@ -257,17 +249,6 @@ struct batadv_bcast_packet {
257 249
258#pragma pack() 250#pragma pack()
259 251
260struct batadv_vis_packet {
261 struct batadv_header header;
262 uint8_t vis_type; /* which type of vis-participant sent this? */
263 __be32 seqno; /* sequence number */
264 uint8_t entries; /* number of entries behind this struct */
265 uint8_t reserved;
266 uint8_t vis_orig[ETH_ALEN]; /* originator reporting its neighbors */
267 uint8_t target_orig[ETH_ALEN]; /* who should receive this packet */
268 uint8_t sender_orig[ETH_ALEN]; /* who sent or forwarded this packet */
269};
270
271/** 252/**
272 * struct batadv_coded_packet - network coded packet 253 * struct batadv_coded_packet - network coded packet
273 * @header: common batman packet header and ttl of first included packet 254 * @header: common batman packet header and ttl of first included packet