diff options
-rw-r--r-- | net/batman-adv/translation-table.c | 4 | ||||
-rw-r--r-- | net/batman-adv/unicast.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 7e9e264cb4df..932232087449 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c | |||
@@ -902,7 +902,7 @@ out_remove: | |||
902 | /* remove address from local hash if present */ | 902 | /* remove address from local hash if present */ |
903 | local_flags = batadv_tt_local_remove(bat_priv, tt_addr, | 903 | local_flags = batadv_tt_local_remove(bat_priv, tt_addr, |
904 | "global tt received", | 904 | "global tt received", |
905 | !!(flags & BATADV_TT_CLIENT_ROAM)); | 905 | flags & BATADV_TT_CLIENT_ROAM); |
906 | tt_global_entry->common.flags |= local_flags & BATADV_TT_CLIENT_WIFI; | 906 | tt_global_entry->common.flags |= local_flags & BATADV_TT_CLIENT_WIFI; |
907 | 907 | ||
908 | if (!(flags & BATADV_TT_CLIENT_ROAM)) | 908 | if (!(flags & BATADV_TT_CLIENT_ROAM)) |
@@ -2515,7 +2515,7 @@ bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv, | |||
2515 | if (!tt_global_entry) | 2515 | if (!tt_global_entry) |
2516 | goto out; | 2516 | goto out; |
2517 | 2517 | ||
2518 | ret = !!(tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM); | 2518 | ret = tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM; |
2519 | batadv_tt_global_entry_free_ref(tt_global_entry); | 2519 | batadv_tt_global_entry_free_ref(tt_global_entry); |
2520 | out: | 2520 | out: |
2521 | return ret; | 2521 | return ret; |
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c index 50e079f00be6..0bb3b5982f94 100644 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c | |||
@@ -122,7 +122,7 @@ batadv_frag_search_packet(struct list_head *head, | |||
122 | { | 122 | { |
123 | struct batadv_frag_packet_list_entry *tfp; | 123 | struct batadv_frag_packet_list_entry *tfp; |
124 | struct batadv_unicast_frag_packet *tmp_up = NULL; | 124 | struct batadv_unicast_frag_packet *tmp_up = NULL; |
125 | int is_head_tmp, is_head; | 125 | bool is_head_tmp, is_head; |
126 | uint16_t search_seqno; | 126 | uint16_t search_seqno; |
127 | 127 | ||
128 | if (up->flags & BATADV_UNI_FRAG_HEAD) | 128 | if (up->flags & BATADV_UNI_FRAG_HEAD) |
@@ -130,7 +130,7 @@ batadv_frag_search_packet(struct list_head *head, | |||
130 | else | 130 | else |
131 | search_seqno = ntohs(up->seqno)-1; | 131 | search_seqno = ntohs(up->seqno)-1; |
132 | 132 | ||
133 | is_head = !!(up->flags & BATADV_UNI_FRAG_HEAD); | 133 | is_head = up->flags & BATADV_UNI_FRAG_HEAD; |
134 | 134 | ||
135 | list_for_each_entry(tfp, head, list) { | 135 | list_for_each_entry(tfp, head, list) { |
136 | if (!tfp->skb) | 136 | if (!tfp->skb) |
@@ -142,7 +142,7 @@ batadv_frag_search_packet(struct list_head *head, | |||
142 | tmp_up = (struct batadv_unicast_frag_packet *)tfp->skb->data; | 142 | tmp_up = (struct batadv_unicast_frag_packet *)tfp->skb->data; |
143 | 143 | ||
144 | if (tfp->seqno == search_seqno) { | 144 | if (tfp->seqno == search_seqno) { |
145 | is_head_tmp = !!(tmp_up->flags & BATADV_UNI_FRAG_HEAD); | 145 | is_head_tmp = tmp_up->flags & BATADV_UNI_FRAG_HEAD; |
146 | if (is_head_tmp != is_head) | 146 | if (is_head_tmp != is_head) |
147 | return tfp; | 147 | return tfp; |
148 | else | 148 | else |