diff options
Diffstat (limited to 'net/batman-adv/aggregation.c')
-rw-r--r-- | net/batman-adv/aggregation.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/batman-adv/aggregation.c b/net/batman-adv/aggregation.c index c11788c4c1a1..9b9459024479 100644 --- a/net/batman-adv/aggregation.c +++ b/net/batman-adv/aggregation.c | |||
@@ -24,10 +24,10 @@ | |||
24 | #include "send.h" | 24 | #include "send.h" |
25 | #include "routing.h" | 25 | #include "routing.h" |
26 | 26 | ||
27 | /* calculate the size of the hna information for a given packet */ | 27 | /* calculate the size of the tt information for a given packet */ |
28 | static int hna_len(struct batman_packet *batman_packet) | 28 | static int tt_len(struct batman_packet *batman_packet) |
29 | { | 29 | { |
30 | return batman_packet->num_hna * ETH_ALEN; | 30 | return batman_packet->num_tt * ETH_ALEN; |
31 | } | 31 | } |
32 | 32 | ||
33 | /* return true if new_packet can be aggregated with forw_packet */ | 33 | /* return true if new_packet can be aggregated with forw_packet */ |
@@ -250,7 +250,7 @@ void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, | |||
250 | { | 250 | { |
251 | struct batman_packet *batman_packet; | 251 | struct batman_packet *batman_packet; |
252 | int buff_pos = 0; | 252 | int buff_pos = 0; |
253 | unsigned char *hna_buff; | 253 | unsigned char *tt_buff; |
254 | 254 | ||
255 | batman_packet = (struct batman_packet *)packet_buff; | 255 | batman_packet = (struct batman_packet *)packet_buff; |
256 | 256 | ||
@@ -259,14 +259,14 @@ void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, | |||
259 | orig_interval. */ | 259 | orig_interval. */ |
260 | batman_packet->seqno = ntohl(batman_packet->seqno); | 260 | batman_packet->seqno = ntohl(batman_packet->seqno); |
261 | 261 | ||
262 | hna_buff = packet_buff + buff_pos + BAT_PACKET_LEN; | 262 | tt_buff = packet_buff + buff_pos + BAT_PACKET_LEN; |
263 | receive_bat_packet(ethhdr, batman_packet, | 263 | receive_bat_packet(ethhdr, batman_packet, |
264 | hna_buff, hna_len(batman_packet), | 264 | tt_buff, tt_len(batman_packet), |
265 | if_incoming); | 265 | if_incoming); |
266 | 266 | ||
267 | buff_pos += BAT_PACKET_LEN + hna_len(batman_packet); | 267 | buff_pos += BAT_PACKET_LEN + tt_len(batman_packet); |
268 | batman_packet = (struct batman_packet *) | 268 | batman_packet = (struct batman_packet *) |
269 | (packet_buff + buff_pos); | 269 | (packet_buff + buff_pos); |
270 | } while (aggregated_packet(buff_pos, packet_len, | 270 | } while (aggregated_packet(buff_pos, packet_len, |
271 | batman_packet->num_hna)); | 271 | batman_packet->num_tt)); |
272 | } | 272 | } |