Skip to content

Commit

Permalink
batman-adv: remove unnecessary type castings
Browse files Browse the repository at this point in the history
remove unnecessary void* type castings.

Signed-off-by: Yu Zhe <yuzhe@nfschina.com>
[sven@narfation.org: Fix missing const in batadv_choose* functions]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
  • Loading branch information
Yu Zhe authored and Simon Wunderlich committed Apr 22, 2022
1 parent cfa4e7b commit 8864d2f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions net/batman-adv/bridge_loop_avoidance.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ batadv_bla_send_announce(struct batadv_priv *bat_priv,
*/
static inline u32 batadv_choose_claim(const void *data, u32 size)
{
struct batadv_bla_claim *claim = (struct batadv_bla_claim *)data;
const struct batadv_bla_claim *claim = data;
u32 hash = 0;

hash = jhash(&claim->addr, sizeof(claim->addr), hash);
Expand All @@ -86,7 +86,7 @@ static inline u32 batadv_choose_backbone_gw(const void *data, u32 size)
const struct batadv_bla_backbone_gw *gw;
u32 hash = 0;

gw = (struct batadv_bla_backbone_gw *)data;
gw = data;
hash = jhash(&gw->orig, sizeof(gw->orig), hash);
hash = jhash(&gw->vid, sizeof(gw->vid), hash);

Expand Down
12 changes: 6 additions & 6 deletions net/batman-adv/translation-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ static bool batadv_compare_tt(const struct hlist_node *node, const void *data2)
*/
static inline u32 batadv_choose_tt(const void *data, u32 size)
{
struct batadv_tt_common_entry *tt;
const struct batadv_tt_common_entry *tt;
u32 hash = 0;

tt = (struct batadv_tt_common_entry *)data;
tt = data;
hash = jhash(&tt->addr, ETH_ALEN, hash);
hash = jhash(&tt->vid, sizeof(tt->vid), hash);

Expand Down Expand Up @@ -2766,7 +2766,7 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv,
u32 i;

tt_tot = batadv_tt_entries(tt_len);
tt_change = (struct batadv_tvlv_tt_change *)tvlv_buff;
tt_change = tvlv_buff;

if (!valid_cb)
return;
Expand Down Expand Up @@ -3994,7 +3994,7 @@ static void batadv_tt_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
if (tvlv_value_len < sizeof(*tt_data))
return;

tt_data = (struct batadv_tvlv_tt_data *)tvlv_value;
tt_data = tvlv_value;
tvlv_value_len -= sizeof(*tt_data);

num_vlan = ntohs(tt_data->num_vlan);
Expand Down Expand Up @@ -4037,7 +4037,7 @@ static int batadv_tt_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv,
if (tvlv_value_len < sizeof(*tt_data))
return NET_RX_SUCCESS;

tt_data = (struct batadv_tvlv_tt_data *)tvlv_value;
tt_data = tvlv_value;
tvlv_value_len -= sizeof(*tt_data);

tt_vlan_len = sizeof(struct batadv_tvlv_tt_vlan_data);
Expand Down Expand Up @@ -4129,7 +4129,7 @@ static int batadv_roam_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv,
goto out;

batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_RX);
roaming_adv = (struct batadv_tvlv_roam_adv *)tvlv_value;
roaming_adv = tvlv_value;

batadv_dbg(BATADV_DBG_TT, bat_priv,
"Received ROAMING_ADV from %pM (client %pM)\n",
Expand Down

0 comments on commit 8864d2f

Please sign in to comment.