Skip to content

Commit

Permalink
batman-adv: rename BATMAN_OGM_LEN to BATMAN_OGM_HLEN
Browse files Browse the repository at this point in the history 
Using BATMAN_OGM_LEN leaves one with the impression that this is
the full packet size which is not the case. Therefore the variable
is renamed.

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
  • Loading branch information
Marek Lindner authored and Antonio Quartulli committed Apr 18, 2012
1 parent cd8b78e commit 76e3d7f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions net/batman-adv/bat_iv_ogm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface)
get_random_bytes(&random_seqno, sizeof(random_seqno));
atomic_set(&hard_iface->seqno, random_seqno);

hard_iface->packet_len = BATMAN_OGM_LEN;
hard_iface->packet_len = BATMAN_OGM_HLEN;
hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC);

if (!hard_iface->packet_buff)
Expand Down Expand Up @@ -112,7 +112,7 @@ static uint8_t hop_penalty(uint8_t tq, const struct bat_priv *bat_priv)
static int bat_iv_ogm_aggr_packet(int buff_pos, int packet_len,
int tt_num_changes)
{
int next_buff_pos = buff_pos + BATMAN_OGM_LEN + tt_len(tt_num_changes);
int next_buff_pos = buff_pos + BATMAN_OGM_HLEN + tt_len(tt_num_changes);

return (next_buff_pos <= packet_len) &&
(next_buff_pos <= MAX_AGGREGATION_BYTES);
Expand Down Expand Up @@ -162,7 +162,7 @@ static void bat_iv_ogm_send_to_if(struct forw_packet *forw_packet,
batman_ogm_packet->ttvn, hard_iface->net_dev->name,
hard_iface->net_dev->dev_addr);

buff_pos += BATMAN_OGM_LEN +
buff_pos += BATMAN_OGM_HLEN +
tt_len(batman_ogm_packet->tt_num_changes);
packet_num++;
batman_ogm_packet = (struct batman_ogm_packet *)
Expand Down Expand Up @@ -540,7 +540,7 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node,
batman_ogm_packet->flags &= ~DIRECTLINK;

bat_iv_ogm_queue_add(bat_priv, (unsigned char *)batman_ogm_packet,
BATMAN_OGM_LEN + tt_len(tt_num_changes),
BATMAN_OGM_HLEN + tt_len(tt_num_changes),
if_incoming, 0, bat_iv_ogm_fwd_send_time());
}

Expand Down Expand Up @@ -1173,12 +1173,12 @@ static void bat_iv_ogm_receive(struct hard_iface *if_incoming,
batman_ogm_packet->seqno = ntohl(batman_ogm_packet->seqno);
batman_ogm_packet->tt_crc = ntohs(batman_ogm_packet->tt_crc);

tt_buff = packet_buff + buff_pos + BATMAN_OGM_LEN;
tt_buff = packet_buff + buff_pos + BATMAN_OGM_HLEN;

bat_iv_ogm_process(ethhdr, batman_ogm_packet,
tt_buff, if_incoming);

buff_pos += BATMAN_OGM_LEN +
buff_pos += BATMAN_OGM_HLEN +
tt_len(batman_ogm_packet->tt_num_changes);

batman_ogm_packet = (struct batman_ogm_packet *)
Expand Down
2 changes: 1 addition & 1 deletion net/batman-adv/packet.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ struct batman_ogm_packet {
uint16_t tt_crc;
} __packed;

#define BATMAN_OGM_LEN sizeof(struct batman_ogm_packet)
#define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet)

struct icmp_packet {
struct batman_header header;
Expand Down
2 changes: 1 addition & 1 deletion net/batman-adv/routing.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ int recv_bat_ogm_packet(struct sk_buff *skb, struct hard_iface *hard_iface)
struct ethhdr *ethhdr;

/* drop packet if it has not necessary minimum size */
if (unlikely(!pskb_may_pull(skb, BATMAN_OGM_LEN)))
if (unlikely(!pskb_may_pull(skb, BATMAN_OGM_HLEN)))
return NET_RX_DROP;

ethhdr = (struct ethhdr *)skb_mac_header(skb);
Expand Down
12 changes: 6 additions & 6 deletions net/batman-adv/send.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static void realloc_packet_buffer(struct hard_iface *hard_iface,
/* keep old buffer if kmalloc should fail */
if (new_buff) {
memcpy(new_buff, hard_iface->packet_buff,
BATMAN_OGM_LEN);
BATMAN_OGM_HLEN);

kfree(hard_iface->packet_buff);
hard_iface->packet_buff = new_buff;
Expand All @@ -101,13 +101,13 @@ static int prepare_packet_buffer(struct bat_priv *bat_priv,
{
int new_len;

new_len = BATMAN_OGM_LEN +
new_len = BATMAN_OGM_HLEN +
tt_len((uint8_t)atomic_read(&bat_priv->tt_local_changes));

/* if we have too many changes for one packet don't send any
* and wait for the tt table request which will be fragmented */
if (new_len > hard_iface->soft_iface->mtu)
new_len = BATMAN_OGM_LEN;
new_len = BATMAN_OGM_HLEN;

realloc_packet_buffer(hard_iface, new_len);

Expand All @@ -117,14 +117,14 @@ static int prepare_packet_buffer(struct bat_priv *bat_priv,
atomic_set(&bat_priv->tt_ogm_append_cnt, TT_OGM_APPEND_MAX);

return tt_changes_fill_buffer(bat_priv,
hard_iface->packet_buff + BATMAN_OGM_LEN,
hard_iface->packet_len - BATMAN_OGM_LEN);
hard_iface->packet_buff + BATMAN_OGM_HLEN,
hard_iface->packet_len - BATMAN_OGM_HLEN);
}

static int reset_packet_buffer(struct bat_priv *bat_priv,
struct hard_iface *hard_iface)
{
realloc_packet_buffer(hard_iface, BATMAN_OGM_LEN);
realloc_packet_buffer(hard_iface, BATMAN_OGM_HLEN);
return 0;
}

Expand Down

0 comments on commit 76e3d7f

Please sign in to comment.