Commit 16a70345 authored by Al Viro's avatar Al Viro Committed by Antonio Quartulli

batman-adv: don't bother flipping ->tt_crc

Keep it net-endian
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent f25bd58a
...@@ -547,8 +547,6 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node, ...@@ -547,8 +547,6 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node,
"Forwarding packet: tq: %i, ttl: %i\n", "Forwarding packet: tq: %i, ttl: %i\n",
batman_ogm_packet->tq, batman_ogm_packet->header.ttl); batman_ogm_packet->tq, batman_ogm_packet->header.ttl);
batman_ogm_packet->tt_crc = htons(batman_ogm_packet->tt_crc);
/* switch of primaries first hop flag when forwarding */ /* switch of primaries first hop flag when forwarding */
batman_ogm_packet->flags &= ~PRIMARIES_FIRST_HOP; batman_ogm_packet->flags &= ~PRIMARIES_FIRST_HOP;
if (is_single_hop_neigh) if (is_single_hop_neigh)
...@@ -724,7 +722,7 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, ...@@ -724,7 +722,7 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv,
tt_update_orig(bat_priv, orig_node, tt_buff, tt_update_orig(bat_priv, orig_node, tt_buff,
batman_ogm_packet->tt_num_changes, batman_ogm_packet->tt_num_changes,
batman_ogm_packet->ttvn, batman_ogm_packet->ttvn,
batman_ogm_packet->tt_crc); ntohs(batman_ogm_packet->tt_crc));
if (orig_node->gw_flags != batman_ogm_packet->gw_flags) if (orig_node->gw_flags != batman_ogm_packet->gw_flags)
gw_node_update(bat_priv, orig_node, gw_node_update(bat_priv, orig_node,
...@@ -972,7 +970,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, ...@@ -972,7 +970,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
ethhdr->h_source, if_incoming->net_dev->name, ethhdr->h_source, if_incoming->net_dev->name,
if_incoming->net_dev->dev_addr, batman_ogm_packet->orig, if_incoming->net_dev->dev_addr, batman_ogm_packet->orig,
batman_ogm_packet->prev_sender, ntohl(batman_ogm_packet->seqno), batman_ogm_packet->prev_sender, ntohl(batman_ogm_packet->seqno),
batman_ogm_packet->ttvn, batman_ogm_packet->tt_crc, batman_ogm_packet->ttvn, ntohs(batman_ogm_packet->tt_crc),
batman_ogm_packet->tt_num_changes, batman_ogm_packet->tq, batman_ogm_packet->tt_num_changes, batman_ogm_packet->tq,
batman_ogm_packet->header.ttl, batman_ogm_packet->header.ttl,
batman_ogm_packet->header.version, has_directlink_flag); batman_ogm_packet->header.version, has_directlink_flag);
...@@ -1219,10 +1217,6 @@ static int bat_iv_ogm_receive(struct sk_buff *skb, ...@@ -1219,10 +1217,6 @@ static int bat_iv_ogm_receive(struct sk_buff *skb,
/* unpack the aggregated packets and process them one by one */ /* unpack the aggregated packets and process them one by one */
do { do {
/* network to host order for our 32bit seqno and the
orig_interval */
batman_ogm_packet->tt_crc = ntohs(batman_ogm_packet->tt_crc);
tt_buff = packet_buff + buff_pos + BATMAN_OGM_HLEN; tt_buff = packet_buff + buff_pos + BATMAN_OGM_HLEN;
bat_iv_ogm_process(ethhdr, batman_ogm_packet, bat_iv_ogm_process(ethhdr, batman_ogm_packet,
......
...@@ -124,7 +124,7 @@ struct batman_ogm_packet { ...@@ -124,7 +124,7 @@ struct batman_ogm_packet {
uint8_t tq; uint8_t tq;
uint8_t tt_num_changes; uint8_t tt_num_changes;
uint8_t ttvn; /* translation table version number */ uint8_t ttvn; /* translation table version number */
uint16_t tt_crc; __be16 tt_crc;
} __packed; } __packed;
#define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet) #define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment