Signed-off-by: Antonio Quartulli antonio@meshcoding.com --- main.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main.h b/main.h index 4c557eb..52cb007 100644 --- a/main.h +++ b/main.h @@ -313,10 +313,10 @@ static inline bool batadv_has_timed_out(unsigned long timestamp, * - when adding 128 - it is neither a predecessor nor a successor, * - after adding more than 127 to the starting value - it is a successor */ -#define batadv_seq_before(x, y) ({typeof(x) _d1 = (x); \ - typeof(y) _d2 = (y); \ - typeof(x) _dummy = (_d1 - _d2); \ - (void) (&_d1 == &_d2); \ +#define batadv_seq_before(x, y) ({typeof(x)_d1 = (x); \ + typeof(y)_d2 = (y); \ + typeof(x)_dummy = (_d1 - _d2); \ + (void)(&_d1 == &_d2); \ _dummy > batadv_smallest_signed_int(_dummy); }) #define batadv_seq_after(x, y) batadv_seq_before(y, x)

Signed-off-by: Antonio Quartulli antonio@meshcoding.com --- debugfs.c | 1 + distributed-arp-table.c | 1 + gateway_client.c | 1 + packet.h | 1 + 4 files changed, 4 insertions(+)

diff --git a/debugfs.c b/debugfs.c index a12e25e..d9b9a8e 100644 --- a/debugfs.c +++ b/debugfs.c @@ -405,6 +405,7 @@ struct batadv_debuginfo batadv_hardif_debuginfo_##_name = { \ .release = single_release, \ }, \ } + static BATADV_HARDIF_DEBUGINFO(originators, S_IRUGO, batadv_originators_hardif_open);

diff --git a/distributed-arp-table.c b/distributed-arp-table.c index b598111..aad022d 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -1100,6 +1100,7 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, batadv_dat_send_data(bat_priv, skb, ip_src, BATADV_P_DAT_DHT_PUT); batadv_dat_send_data(bat_priv, skb, ip_dst, BATADV_P_DAT_DHT_PUT); } + /** * batadv_dat_snoop_incoming_arp_reply - snoop the ARP reply and fill the local * DAT storage only diff --git a/gateway_client.c b/gateway_client.c index 90cff58..bcc3e0c 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -775,6 +775,7 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,

return ret; } + /** * batadv_gw_out_of_range - check if the dhcp request destination is the best gw * @bat_priv: the bat priv with all the soft interface information diff --git a/packet.h b/packet.h index 34e096d..facd1fe 100644 --- a/packet.h +++ b/packet.h @@ -198,6 +198,7 @@ struct batadv_bla_claim_dst { uint8_t type; /* bla_claimframe */ __be16 group; /* group id */ }; + #pragma pack()

/**

Signed-off-by: Antonio Quartulli antonio@meshcoding.com --- bat_iv_ogm.c | 2 -- bitarray.c | 1 - bridge_loop_avoidance.c | 7 ------- fragmentation.c | 1 - main.c | 1 - originator.c | 1 - originator.h | 1 - routing.c | 1 - soft-interface.c | 1 - sysfs.c | 1 - translation-table.c | 1 - 11 files changed, 18 deletions(-)

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 73209f3..4dd7c40 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -26,7 +26,6 @@ #include "bat_algo.h" #include "network-coding.h"

- /** * enum batadv_dup_status - duplicate status * @BATADV_NO_DUP: the packet is a duplicate @@ -1362,7 +1361,6 @@ out: return ret; }

- /** * batadv_iv_ogm_process_per_outif - process a batman iv OGM for an outgoing if * @skb: the skb containing the OGM diff --git a/bitarray.c b/bitarray.c index 9586750..e3da07a 100644 --- a/bitarray.c +++ b/bitarray.c @@ -29,7 +29,6 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n) bitmap_shift_left(seq_bits, seq_bits, n, BATADV_TQ_LOCAL_WINDOW_SIZE); }

- /* receive and process one packet within the sequence number window. * * returns: diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 0f0ca43..4fc6cab 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -69,7 +69,6 @@ static inline uint32_t batadv_choose_backbone_gw(const void *data, return hash % size; }

- /* compares address and vid of two backbone gws */ static int batadv_compare_backbone_gw(const struct hlist_node *node, const void *data2) @@ -662,7 +661,6 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, if (unlikely(!backbone_gw)) return 1;

- /* handle as ANNOUNCE frame */ backbone_gw->lasttime = jiffies; crc = ntohs(*((__be16 *)(&an_addr[4]))); @@ -849,7 +847,6 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, return 2; }

- /** * batadv_bla_process_claim * @bat_priv: the bat priv with all the soft interface information @@ -1347,8 +1344,6 @@ out: return ret; }

- - /** * batadv_bla_is_backbone_gw_orig * @bat_priv: the bat priv with all the soft interface information @@ -1390,7 +1385,6 @@ bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig, return false; }

- /** * batadv_bla_is_backbone_gw * @skb: the frame to be checked @@ -1480,7 +1474,6 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, if (!atomic_read(&bat_priv->bridge_loop_avoidance)) goto allow;

- if (unlikely(atomic_read(&bat_priv->bla.num_requests))) /* don't allow broadcasts while requests are in flight */ if (is_multicast_ether_addr(ethhdr->h_dest) && is_bcast) diff --git a/fragmentation.c b/fragmentation.c index 022d18a..022156d 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -23,7 +23,6 @@ #include "hard-interface.h" #include "soft-interface.h"

- /** * batadv_frag_clear_chain - delete entries in the fragment buffer chain * @head: head of chain with entries. diff --git a/main.c b/main.c index 2cdd25a..d4079cd 100644 --- a/main.c +++ b/main.c @@ -41,7 +41,6 @@ #include "network-coding.h" #include "fragmentation.h"

- /* List manipulations on hardif_list have to be rtnl_lock()'ed, * list traversals just rcu-locked */ diff --git a/originator.c b/originator.c index 6a48451..6c65c54 100644 --- a/originator.c +++ b/originator.c @@ -799,7 +799,6 @@ batadv_purge_orig_ifinfo(struct batadv_priv *bat_priv, return ifinfo_purged; }

- /** * batadv_purge_orig_neighbors - purges neighbors from originator * @bat_priv: the bat priv with all the soft interface information diff --git a/originator.h b/originator.h index db3a9ed..aa4a436 100644 --- a/originator.h +++ b/originator.h @@ -70,7 +70,6 @@ batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node, unsigned short vid); void batadv_orig_node_vlan_free_ref(struct batadv_orig_node_vlan *orig_vlan);

- /* hashfunction to choose an entry in a hash table of given size * hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ diff --git a/routing.c b/routing.c index 35f76f2..3a6764d 100644 --- a/routing.c +++ b/routing.c @@ -292,7 +292,6 @@ out: return ret; }

- int batadv_recv_icmp_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if) { diff --git a/soft-interface.c b/soft-interface.c index 9bf382d..ea80e6d 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -36,7 +36,6 @@ #include "bridge_loop_avoidance.h" #include "network-coding.h"

- static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); static void batadv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info); diff --git a/sysfs.c b/sysfs.c index fc47baa..a63c3eb 100644 --- a/sysfs.c +++ b/sysfs.c @@ -151,7 +151,6 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ batadv_store_##_name)

- #define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ ssize_t batadv_store_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff, \ diff --git a/translation-table.c b/translation-table.c index 38a804e..84e6f01 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1780,7 +1780,6 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, batadv_tt_global_del_roaming(bat_priv, tt_global_entry, orig_node, message);

- out: if (tt_global_entry) batadv_tt_global_entry_free_ref(tt_global_entry);

Signed-off-by: Antonio Quartulli antonio@meshcoding.com --- bat_iv_ogm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 4dd7c40..00e00e0 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -878,7 +878,7 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface) hlist_for_each_entry_rcu(orig_node, head, hash_entry) { spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); word_index = hard_iface->if_num * BATADV_NUM_WORDS; - word = &(orig_node->bat_iv.bcast_own[word_index]); + word = &orig_node->bat_iv.bcast_own[word_index];

batadv_bit_get_packet(bat_priv, word, 1, 0); if_num = hard_iface->if_num; @@ -1663,7 +1663,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, offset = if_num * BATADV_NUM_WORDS;

spin_lock_bh(&orig_neigh_node->bat_iv.ogm_cnt_lock); - word = &(orig_neigh_node->bat_iv.bcast_own[offset]); + word = &orig_neigh_node->bat_iv.bcast_own[offset]; bit_pos = if_incoming_seqno - 2; bit_pos -= ntohl(ogm_packet->seqno); batadv_set_bit(word, bit_pos);