Skip to content

Commit

Permalink
batman-adv: convert bat_priv->tt_crc from atomic_t to uint16_t
Browse files Browse the repository at this point in the history
In the code we neever need to atomically check and set the bat_priv->tt_crc
field value. It is simply set and read once in different pieces of the code.
Therefore this field can be safely be converted from atomic_t to uint16_t.

Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
  • Loading branch information
Antonio Quartulli committed Jun 18, 2012
1 parent 5d52dad commit 66a1b2b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions net/batman-adv/bat_iv_ogm.c
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,7 @@ static void bat_iv_ogm_schedule(struct hard_iface *hard_iface,
htonl((uint32_t)atomic_read(&hard_iface->seqno));

batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
batman_ogm_packet->tt_crc = htons((uint16_t)
atomic_read(&bat_priv->tt_crc));
batman_ogm_packet->tt_crc = htons(bat_priv->tt_crc);
if (tt_num_changes >= 0)
batman_ogm_packet->tt_num_changes = tt_num_changes;

Expand Down
2 changes: 1 addition & 1 deletion net/batman-adv/send.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ static int prepare_packet_buffer(struct bat_priv *bat_priv,

realloc_packet_buffer(hard_iface, new_len);

atomic_set(&bat_priv->tt_crc, tt_local_crc(bat_priv));
bat_priv->tt_crc = tt_local_crc(bat_priv);

/* reset the sending counter */
atomic_set(&bat_priv->tt_ogm_append_cnt, TT_OGM_APPEND_MAX);
Expand Down
2 changes: 1 addition & 1 deletion net/batman-adv/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ struct bat_priv {
spinlock_t vis_list_lock; /* protects vis_info::recv_list */
atomic_t num_local_tt;
/* Checksum of the local table, recomputed before sending a new OGM */
atomic_t tt_crc;
uint16_t tt_crc;
unsigned char *tt_buff;
int16_t tt_buff_len;
spinlock_t tt_buff_lock; /* protects tt_buff */
Expand Down

0 comments on commit 66a1b2b

Please sign in to comment.