Commit fb57720d authored by David S. Miller's avatar David S. Miller

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- remove useless return in void functions
- remove unused member 'primary_iface' from 'struct orig_node'
- improve existing kernel doc
- fix several checkpatch complaints
- ensure socket's control block is cleared for received skbs
- add missing DEBUG_FS dependency to BATMAN_ADV_DEBUG symbol
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f40e74ff 95353956
...@@ -62,6 +62,7 @@ config BATMAN_ADV_MCAST ...@@ -62,6 +62,7 @@ config BATMAN_ADV_MCAST
config BATMAN_ADV_DEBUG config BATMAN_ADV_DEBUG
bool "B.A.T.M.A.N. debugging" bool "B.A.T.M.A.N. debugging"
depends on BATMAN_ADV depends on BATMAN_ADV
depends on DEBUG_FS
help help
This is an option for use by developers; most people should This is an option for use by developers; most people should
say N here. This enables compilation of support for say N here. This enables compilation of support for
......
...@@ -26,9 +26,8 @@ ...@@ -26,9 +26,8 @@
#include "bat_algo.h" #include "bat_algo.h"
#include "network-coding.h" #include "network-coding.h"
/** /**
* batadv_dup_status - duplicate status * enum batadv_dup_status - duplicate status
* @BATADV_NO_DUP: the packet is a duplicate * @BATADV_NO_DUP: the packet is a duplicate
* @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the * @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the
* neighbor) * neighbor)
...@@ -517,7 +516,7 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet) ...@@ -517,7 +516,7 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet)
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
* @packet_len: (total) length of the OGM * @packet_len: (total) length of the OGM
* @send_time: timestamp (jiffies) when the packet is to be sent * @send_time: timestamp (jiffies) when the packet is to be sent
* @direktlink: true if this is a direct link packet * @directlink: true if this is a direct link packet
* @if_incoming: interface where the packet was received * @if_incoming: interface where the packet was received
* @if_outgoing: interface for which the retransmission should be considered * @if_outgoing: interface for which the retransmission should be considered
* @forw_packet: the forwarded packet which should be checked * @forw_packet: the forwarded packet which should be checked
...@@ -879,7 +878,7 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface) ...@@ -879,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) { hlist_for_each_entry_rcu(orig_node, head, hash_entry) {
spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock);
word_index = hard_iface->if_num * BATADV_NUM_WORDS; 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); batadv_bit_get_packet(bat_priv, word, 1, 0);
if_num = hard_iface->if_num; if_num = hard_iface->if_num;
...@@ -1362,10 +1361,10 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, ...@@ -1362,10 +1361,10 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
return ret; return ret;
} }
/** /**
* batadv_iv_ogm_process_per_outif - process a batman iv OGM for an outgoing if * batadv_iv_ogm_process_per_outif - process a batman iv OGM for an outgoing if
* @skb: the skb containing the OGM * @skb: the skb containing the OGM
* @ogm_offset: offset from skb->data to start of ogm header
* @orig_node: the (cached) orig node for the originator of this OGM * @orig_node: the (cached) orig node for the originator of this OGM
* @if_incoming: the interface where this packet was received * @if_incoming: the interface where this packet was received
* @if_outgoing: the interface for which the packet should be considered * @if_outgoing: the interface for which the packet should be considered
...@@ -1664,7 +1663,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, ...@@ -1664,7 +1663,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
offset = if_num * BATADV_NUM_WORDS; offset = if_num * BATADV_NUM_WORDS;
spin_lock_bh(&orig_neigh_node->bat_iv.ogm_cnt_lock); 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 = if_incoming_seqno - 2;
bit_pos -= ntohl(ogm_packet->seqno); bit_pos -= ntohl(ogm_packet->seqno);
batadv_set_bit(word, bit_pos); batadv_set_bit(word, bit_pos);
...@@ -1902,10 +1901,10 @@ static int batadv_iv_ogm_neigh_cmp(struct batadv_neigh_node *neigh1, ...@@ -1902,10 +1901,10 @@ static int batadv_iv_ogm_neigh_cmp(struct batadv_neigh_node *neigh1,
* batadv_iv_ogm_neigh_is_eob - check if neigh1 is equally good or better than * batadv_iv_ogm_neigh_is_eob - check if neigh1 is equally good or better than
* neigh2 from the metric prospective * neigh2 from the metric prospective
* @neigh1: the first neighbor object of the comparison * @neigh1: the first neighbor object of the comparison
* @if_outgoing: outgoing interface for the first neighbor * @if_outgoing1: outgoing interface for the first neighbor
* @neigh2: the second neighbor object of the comparison * @neigh2: the second neighbor object of the comparison
* @if_outgoing2: outgoing interface for the second neighbor * @if_outgoing2: outgoing interface for the second neighbor
*
* Returns true if the metric via neigh1 is equally good or better than * Returns true if the metric via neigh1 is equally good or better than
* the metric via neigh2, false otherwise. * the metric via neigh2, false otherwise.
*/ */
......
...@@ -29,7 +29,6 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n) ...@@ -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); bitmap_shift_left(seq_bits, seq_bits, n, BATADV_TQ_LOCAL_WINDOW_SIZE);
} }
/* receive and process one packet within the sequence number window. /* receive and process one packet within the sequence number window.
* *
* returns: * returns:
......
...@@ -29,8 +29,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits, ...@@ -29,8 +29,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits,
diff = last_seqno - curr_seqno; diff = last_seqno - curr_seqno;
if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE) if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE)
return 0; return 0;
else return test_bit(diff, seq_bits) != 0;
return test_bit(diff, seq_bits) != 0;
} }
/* turn corresponding bit on, so we can remember that we got the packet */ /* turn corresponding bit on, so we can remember that we got the packet */
......
...@@ -69,7 +69,6 @@ static inline uint32_t batadv_choose_backbone_gw(const void *data, ...@@ -69,7 +69,6 @@ static inline uint32_t batadv_choose_backbone_gw(const void *data,
return hash % size; return hash % size;
} }
/* compares address and vid of two backbone gws */ /* compares address and vid of two backbone gws */
static int batadv_compare_backbone_gw(const struct hlist_node *node, static int batadv_compare_backbone_gw(const struct hlist_node *node,
const void *data2) const void *data2)
...@@ -245,14 +244,14 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw) ...@@ -245,14 +244,14 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw)
spin_unlock_bh(list_lock); spin_unlock_bh(list_lock);
} }
/* all claims gone, intialize CRC */ /* all claims gone, initialize CRC */
backbone_gw->crc = BATADV_BLA_CRC_INIT; backbone_gw->crc = BATADV_BLA_CRC_INIT;
} }
/** /**
* batadv_bla_send_claim - sends a claim frame according to the provided info * batadv_bla_send_claim - sends a claim frame according to the provided info
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
* @orig: the mac address to be announced within the claim * @mac: the mac address to be announced within the claim
* @vid: the VLAN ID * @vid: the VLAN ID
* @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...) * @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...)
*/ */
...@@ -364,6 +363,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, ...@@ -364,6 +363,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac,
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
* @orig: the mac address of the originator * @orig: the mac address of the originator
* @vid: the VLAN ID * @vid: the VLAN ID
* @own_backbone: set if the requested backbone is local
* *
* searches for the backbone gw or creates a new one if it could not * searches for the backbone gw or creates a new one if it could not
* be found. * be found.
...@@ -454,6 +454,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv, ...@@ -454,6 +454,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv,
/** /**
* batadv_bla_answer_request - answer a bla request by sending own claims * batadv_bla_answer_request - answer a bla request by sending own claims
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
* @primary_if: interface where the request came on
* @vid: the vid where the request came on * @vid: the vid where the request came on
* *
* Repeat all of our own claims, and finally send an ANNOUNCE frame * Repeat all of our own claims, and finally send an ANNOUNCE frame
...@@ -660,7 +661,6 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, ...@@ -660,7 +661,6 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv,
if (unlikely(!backbone_gw)) if (unlikely(!backbone_gw))
return 1; return 1;
/* handle as ANNOUNCE frame */ /* handle as ANNOUNCE frame */
backbone_gw->lasttime = jiffies; backbone_gw->lasttime = jiffies;
crc = ntohs(*((__be16 *)(&an_addr[4]))); crc = ntohs(*((__be16 *)(&an_addr[4])));
...@@ -775,6 +775,7 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv, ...@@ -775,6 +775,7 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv,
/** /**
* batadv_check_claim_group * batadv_check_claim_group
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
* @primary_if: the primary interface of this batman interface
* @hw_src: the Hardware source in the ARP Header * @hw_src: the Hardware source in the ARP Header
* @hw_dst: the Hardware destination in the ARP Header * @hw_dst: the Hardware destination in the ARP Header
* @ethhdr: pointer to the Ethernet header of the claim frame * @ethhdr: pointer to the Ethernet header of the claim frame
...@@ -846,10 +847,10 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, ...@@ -846,10 +847,10 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv,
return 2; return 2;
} }
/** /**
* batadv_bla_process_claim * batadv_bla_process_claim
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
* @primary_if: the primary hard interface of this batman soft interface
* @skb: the frame to be checked * @skb: the frame to be checked
* *
* Check if this is a claim frame, and process it accordingly. * Check if this is a claim frame, and process it accordingly.
...@@ -1327,7 +1328,7 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, ...@@ -1327,7 +1328,7 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,
goto out; goto out;
} }
/* not found, add a new entry (overwrite the oldest entry) /* not found, add a new entry (overwrite the oldest entry)
* and allow it, its the first occurence. * and allow it, its the first occurrence.
*/ */
curr = (bat_priv->bla.bcast_duplist_curr + BATADV_DUPLIST_SIZE - 1); curr = (bat_priv->bla.bcast_duplist_curr + BATADV_DUPLIST_SIZE - 1);
curr %= BATADV_DUPLIST_SIZE; curr %= BATADV_DUPLIST_SIZE;
...@@ -1343,8 +1344,6 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, ...@@ -1343,8 +1344,6 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,
return ret; return ret;
} }
/** /**
* batadv_bla_is_backbone_gw_orig * batadv_bla_is_backbone_gw_orig
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
...@@ -1386,7 +1385,6 @@ bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig, ...@@ -1386,7 +1385,6 @@ bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig,
return false; return false;
} }
/** /**
* batadv_bla_is_backbone_gw * batadv_bla_is_backbone_gw
* @skb: the frame to be checked * @skb: the frame to be checked
...@@ -1476,7 +1474,6 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, ...@@ -1476,7 +1474,6 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
if (!atomic_read(&bat_priv->bridge_loop_avoidance)) if (!atomic_read(&bat_priv->bridge_loop_avoidance))
goto allow; goto allow;
if (unlikely(atomic_read(&bat_priv->bla.num_requests))) if (unlikely(atomic_read(&bat_priv->bla.num_requests)))
/* don't allow broadcasts while requests are in flight */ /* don't allow broadcasts while requests are in flight */
if (is_multicast_ether_addr(ethhdr->h_dest) && is_bcast) if (is_multicast_ether_addr(ethhdr->h_dest) && is_bcast)
......
...@@ -233,7 +233,6 @@ static int batadv_debug_log_setup(struct batadv_priv *bat_priv) ...@@ -233,7 +233,6 @@ static int batadv_debug_log_setup(struct batadv_priv *bat_priv)
static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv) static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv)
{ {
return;
} }
#endif #endif
...@@ -405,6 +404,7 @@ struct batadv_debuginfo batadv_hardif_debuginfo_##_name = { \ ...@@ -405,6 +404,7 @@ struct batadv_debuginfo batadv_hardif_debuginfo_##_name = { \
.release = single_release, \ .release = single_release, \
}, \ }, \
} }
static BATADV_HARDIF_DEBUGINFO(originators, S_IRUGO, static BATADV_HARDIF_DEBUGINFO(originators, S_IRUGO,
batadv_originators_hardif_open); batadv_originators_hardif_open);
......
...@@ -1100,6 +1100,7 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, ...@@ -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_src, BATADV_P_DAT_DHT_PUT);
batadv_dat_send_data(bat_priv, skb, ip_dst, 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 * batadv_dat_snoop_incoming_arp_reply - snoop the ARP reply and fill the local
* DAT storage only * DAT storage only
......
...@@ -25,9 +25,7 @@ ...@@ -25,9 +25,7 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
/** /* BATADV_DAT_ADDR_MAX - maximum address value in the DHT space */
* BATADV_DAT_ADDR_MAX - maximum address value in the DHT space
*/
#define BATADV_DAT_ADDR_MAX ((batadv_dat_addr_t)~(batadv_dat_addr_t)0) #define BATADV_DAT_ADDR_MAX ((batadv_dat_addr_t)~(batadv_dat_addr_t)0)
void batadv_dat_status_update(struct net_device *net_dev); void batadv_dat_status_update(struct net_device *net_dev);
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "hard-interface.h" #include "hard-interface.h"
#include "soft-interface.h" #include "soft-interface.h"
/** /**
* batadv_frag_clear_chain - delete entries in the fragment buffer chain * batadv_frag_clear_chain - delete entries in the fragment buffer chain
* @head: head of chain with entries. * @head: head of chain with entries.
......
...@@ -41,8 +41,7 @@ batadv_frag_check_entry(struct batadv_frag_table_entry *frags_entry) ...@@ -41,8 +41,7 @@ batadv_frag_check_entry(struct batadv_frag_table_entry *frags_entry)
if (!hlist_empty(&frags_entry->head) && if (!hlist_empty(&frags_entry->head) &&
batadv_has_timed_out(frags_entry->timestamp, BATADV_FRAG_TIMEOUT)) batadv_has_timed_out(frags_entry->timestamp, BATADV_FRAG_TIMEOUT))
return true; return true;
else return false;
return false;
} }
#endif /* _NET_BATMAN_ADV_FRAGMENTATION_H_ */ #endif /* _NET_BATMAN_ADV_FRAGMENTATION_H_ */
...@@ -775,6 +775,7 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len, ...@@ -775,6 +775,7 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,
return ret; return ret;
} }
/** /**
* batadv_gw_out_of_range - check if the dhcp request destination is the best gw * 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 * @bat_priv: the bat priv with all the soft interface information
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include "network-coding.h" #include "network-coding.h"
#include "fragmentation.h" #include "fragmentation.h"
/* List manipulations on hardif_list have to be rtnl_lock()'ed, /* List manipulations on hardif_list have to be rtnl_lock()'ed,
* list traversals just rcu-locked * list traversals just rcu-locked
*/ */
...@@ -403,6 +402,9 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, ...@@ -403,6 +402,9 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
goto err_free; goto err_free;
} }
/* reset control block to avoid left overs from previous users */
memset(skb->cb, 0, sizeof(struct batadv_skb_cb));
/* all receive handlers return whether they received or reused /* all receive handlers return whether they received or reused
* the supplied skb. if not, we have to free the skb. * the supplied skb. if not, we have to free the skb.
*/ */
...@@ -651,7 +653,7 @@ static struct batadv_tvlv_handler ...@@ -651,7 +653,7 @@ static struct batadv_tvlv_handler
/** /**
* batadv_tvlv_container_free_ref - decrement the tvlv container refcounter and * batadv_tvlv_container_free_ref - decrement the tvlv container refcounter and
* possibly free it * possibly free it
* @tvlv_handler: the tvlv container to free * @tvlv: the tvlv container to free
*/ */
static void batadv_tvlv_container_free_ref(struct batadv_tvlv_container *tvlv) static void batadv_tvlv_container_free_ref(struct batadv_tvlv_container *tvlv)
{ {
...@@ -796,11 +798,11 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv, ...@@ -796,11 +798,11 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv,
} }
/** /**
* batadv_tvlv_realloc_packet_buff - reallocate packet buffer to accomodate * batadv_tvlv_realloc_packet_buff - reallocate packet buffer to accommodate
* requested packet size * requested packet size
* @packet_buff: packet buffer * @packet_buff: packet buffer
* @packet_buff_len: packet buffer size * @packet_buff_len: packet buffer size
* @packet_min_len: requested packet minimum size * @min_packet_len: requested packet minimum size
* @additional_packet_len: requested additional packet size on top of minimum * @additional_packet_len: requested additional packet size on top of minimum
* size * size
* *
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define BATADV_DRIVER_DEVICE "batman-adv" #define BATADV_DRIVER_DEVICE "batman-adv"
#ifndef BATADV_SOURCE_VERSION #ifndef BATADV_SOURCE_VERSION
#define BATADV_SOURCE_VERSION "2014.4.0" #define BATADV_SOURCE_VERSION "2015.0"
#endif #endif
/* B.A.T.M.A.N. parameters */ /* B.A.T.M.A.N. parameters */
...@@ -92,9 +92,8 @@ ...@@ -92,9 +92,8 @@
/* numbers of originator to contact for any PUT/GET DHT operation */ /* numbers of originator to contact for any PUT/GET DHT operation */
#define BATADV_DAT_CANDIDATES_NUM 3 #define BATADV_DAT_CANDIDATES_NUM 3
/** /* BATADV_TQ_SIMILARITY_THRESHOLD - TQ points that a secondary metric can differ
* BATADV_TQ_SIMILARITY_THRESHOLD - TQ points that a secondary metric can differ * at most from the primary one in order to be still considered acceptable
* at most from the primary one in order to be still considered acceptable
*/ */
#define BATADV_TQ_SIMILARITY_THRESHOLD 50 #define BATADV_TQ_SIMILARITY_THRESHOLD 50
...@@ -313,10 +312,10 @@ static inline bool batadv_has_timed_out(unsigned long timestamp, ...@@ -313,10 +312,10 @@ static inline bool batadv_has_timed_out(unsigned long timestamp,
* - when adding 128 - it is neither a predecessor nor a successor, * - when adding 128 - it is neither a predecessor nor a successor,
* - after adding more than 127 to the starting value - it is 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); \ #define batadv_seq_before(x, y) ({typeof(x)_d1 = (x); \
typeof(y) _d2 = (y); \ typeof(y)_d2 = (y); \
typeof(x) _dummy = (_d1 - _d2); \ typeof(x)_dummy = (_d1 - _d2); \
(void) (&_d1 == &_d2); \ (void)(&_d1 == &_d2); \
_dummy > batadv_smallest_signed_int(_dummy); }) _dummy > batadv_smallest_signed_int(_dummy); })
#define batadv_seq_after(x, y) batadv_seq_before(y, x) #define batadv_seq_after(x, y) batadv_seq_before(y, x)
......
...@@ -50,7 +50,6 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node); ...@@ -50,7 +50,6 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node);
static inline void batadv_mcast_mla_update(struct batadv_priv *bat_priv) static inline void batadv_mcast_mla_update(struct batadv_priv *bat_priv)
{ {
return;
} }
static inline enum batadv_forw_mode static inline enum batadv_forw_mode
...@@ -67,12 +66,10 @@ static inline int batadv_mcast_init(struct batadv_priv *bat_priv) ...@@ -67,12 +66,10 @@ static inline int batadv_mcast_init(struct batadv_priv *bat_priv)
static inline void batadv_mcast_free(struct batadv_priv *bat_priv) static inline void batadv_mcast_free(struct batadv_priv *bat_priv)
{ {
return;
} }
static inline void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node) static inline void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node)
{ {
return;
} }
#endif /* CONFIG_BATMAN_ADV_MCAST */ #endif /* CONFIG_BATMAN_ADV_MCAST */
......
...@@ -1212,8 +1212,7 @@ static bool batadv_nc_skb_coding_possible(struct sk_buff *skb, ...@@ -1212,8 +1212,7 @@ static bool batadv_nc_skb_coding_possible(struct sk_buff *skb,
{ {
if (BATADV_SKB_CB(skb)->decoded && !batadv_compare_eth(dst, src)) if (BATADV_SKB_CB(skb)->decoded && !batadv_compare_eth(dst, src))
return false; return false;
else return true;
return true;
} }
/** /**
......
...@@ -797,7 +797,6 @@ batadv_purge_orig_ifinfo(struct batadv_priv *bat_priv, ...@@ -797,7 +797,6 @@ batadv_purge_orig_ifinfo(struct batadv_priv *bat_priv,
return ifinfo_purged; return ifinfo_purged;
} }
/** /**
* batadv_purge_orig_neighbors - purges neighbors from originator * batadv_purge_orig_neighbors - purges neighbors from originator
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
......
...@@ -70,7 +70,6 @@ batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node, ...@@ -70,7 +70,6 @@ batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node,
unsigned short vid); unsigned short vid);
void batadv_orig_node_vlan_free_ref(struct batadv_orig_node_vlan *orig_vlan); 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 /* hashfunction to choose an entry in a hash table of given size
* hash algorithm from http://en.wikipedia.org/wiki/Hash_table * hash algorithm from http://en.wikipedia.org/wiki/Hash_table
*/ */
......
...@@ -198,6 +198,7 @@ struct batadv_bla_claim_dst { ...@@ -198,6 +198,7 @@ struct batadv_bla_claim_dst {
uint8_t type; /* bla_claimframe */ uint8_t type; /* bla_claimframe */
__be16 group; /* group id */ __be16 group; /* group id */
}; };
#pragma pack() #pragma pack()
/** /**
...@@ -376,7 +377,7 @@ struct batadv_frag_packet { ...@@ -376,7 +377,7 @@ struct batadv_frag_packet {
uint8_t reserved:4; uint8_t reserved:4;
uint8_t no:4; uint8_t no:4;
#else #else
#error "unknown bitfield endianess" #error "unknown bitfield endianness"
#endif #endif
uint8_t dest[ETH_ALEN]; uint8_t dest[ETH_ALEN];
uint8_t orig[ETH_ALEN]; uint8_t orig[ETH_ALEN];
...@@ -452,7 +453,7 @@ struct batadv_coded_packet { ...@@ -452,7 +453,7 @@ struct batadv_coded_packet {
* @src: address of the source * @src: address of the source
* @dst: address of the destination * @dst: address of the destination
* @tvlv_len: length of tvlv data following the unicast tvlv header * @tvlv_len: length of tvlv data following the unicast tvlv header
* @align: 2 bytes to align the header to a 4 byte boundry * @align: 2 bytes to align the header to a 4 byte boundary
*/ */
struct batadv_unicast_tvlv_packet { struct batadv_unicast_tvlv_packet {
uint8_t packet_type; uint8_t packet_type;
......
...@@ -292,7 +292,6 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, ...@@ -292,7 +292,6 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv,
return ret; return ret;
} }
int batadv_recv_icmp_packet(struct sk_buff *skb, int batadv_recv_icmp_packet(struct sk_buff *skb,
struct batadv_hard_iface *recv_if) struct batadv_hard_iface *recv_if)
{ {
...@@ -457,7 +456,7 @@ batadv_find_router(struct batadv_priv *bat_priv, ...@@ -457,7 +456,7 @@ batadv_find_router(struct batadv_priv *bat_priv,
* the last chosen bonding candidate (next_candidate). If no such * the last chosen bonding candidate (next_candidate). If no such
* router is found, use the first candidate found (the previously * router is found, use the first candidate found (the previously
* chosen bonding candidate might have been the last one in the list). * chosen bonding candidate might have been the last one in the list).
* If this can't be found either, return the previously choosen * If this can't be found either, return the previously chosen
* router - obviously there are no other candidates. * router - obviously there are no other candidates.
*/ */
rcu_read_lock(); rcu_read_lock();
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include "bridge_loop_avoidance.h" #include "bridge_loop_avoidance.h"
#include "network-coding.h" #include "network-coding.h"
static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);
static void batadv_get_drvinfo(struct net_device *dev, static void batadv_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info); struct ethtool_drvinfo *info);
......
...@@ -151,7 +151,6 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ ...@@ -151,7 +151,6 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \
static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ static BATADV_ATTR(_name, _mode, batadv_show_##_name, \
batadv_store_##_name) batadv_store_##_name)
#define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ #define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \
ssize_t batadv_store_##_name(struct kobject *kobj, \ ssize_t batadv_store_##_name(struct kobject *kobj, \
struct attribute *attr, char *buff, \ struct attribute *attr, char *buff, \
......
...@@ -1780,7 +1780,6 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, ...@@ -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, batadv_tt_global_del_roaming(bat_priv, tt_global_entry,
orig_node, message); orig_node, message);
out: out:
if (tt_global_entry) if (tt_global_entry)
batadv_tt_global_entry_free_ref(tt_global_entry); batadv_tt_global_entry_free_ref(tt_global_entry);
...@@ -2769,9 +2768,8 @@ static bool batadv_send_tt_response(struct batadv_priv *bat_priv, ...@@ -2769,9 +2768,8 @@ static bool batadv_send_tt_response(struct batadv_priv *bat_priv,
{ {
if (batadv_is_my_mac(bat_priv, req_dst)) if (batadv_is_my_mac(bat_priv, req_dst))
return batadv_send_my_tt_response(bat_priv, tt_data, req_src); return batadv_send_my_tt_response(bat_priv, tt_data, req_src);
else return batadv_send_other_tt_response(bat_priv, tt_data, req_src,
return batadv_send_other_tt_response(bat_priv, tt_data, req_dst);
req_src, req_dst);
} }
static void _batadv_tt_update_changes(struct batadv_priv *bat_priv, static void _batadv_tt_update_changes(struct batadv_priv *bat_priv,
...@@ -2854,7 +2852,7 @@ static void batadv_tt_update_changes(struct batadv_priv *bat_priv, ...@@ -2854,7 +2852,7 @@ static void batadv_tt_update_changes(struct batadv_priv *bat_priv,
/** /**
* batadv_is_my_client - check if a client is served by the local node * batadv_is_my_client - check if a client is served by the local node
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
* @addr: the mac adress of the client to check * @addr: the mac address of the client to check
* @vid: VLAN identifier * @vid: VLAN identifier
* *
* Returns true if the client is served by this node, false otherwise. * Returns true if the client is served by this node, false otherwise.
......
...@@ -199,7 +199,6 @@ struct batadv_orig_bat_iv { ...@@ -199,7 +199,6 @@ struct batadv_orig_bat_iv {
/** /**
* struct batadv_orig_node - structure for orig_list maintaining nodes of mesh * struct batadv_orig_node - structure for orig_list maintaining nodes of mesh
* @orig: originator ethernet address * @orig: originator ethernet address
* @primary_addr: hosts primary interface address
* @ifinfo_list: list for routers per outgoing interface * @ifinfo_list: list for routers per outgoing interface
* @last_bonding_candidate: pointer to last ifinfo of last used router * @last_bonding_candidate: pointer to last ifinfo of last used router
* @batadv_dat_addr_t: address of the orig node in the distributed hash * @batadv_dat_addr_t: address of the orig node in the distributed hash
...@@ -244,7 +243,6 @@ struct batadv_orig_bat_iv { ...@@ -244,7 +243,6 @@ struct batadv_orig_bat_iv {
*/ */
struct batadv_orig_node { struct batadv_orig_node {
uint8_t orig[ETH_ALEN]; uint8_t orig[ETH_ALEN];
uint8_t primary_addr[ETH_ALEN];
struct hlist_head ifinfo_list; struct hlist_head ifinfo_list;
struct batadv_orig_ifinfo *last_bonding_candidate; struct batadv_orig_ifinfo *last_bonding_candidate;
#ifdef CONFIG_BATMAN_ADV_DAT #ifdef CONFIG_BATMAN_ADV_DAT
...@@ -970,7 +968,7 @@ struct batadv_tt_orig_list_entry { ...@@ -970,7 +968,7 @@ struct batadv_tt_orig_list_entry {
}; };
/** /**
* struct batadv_tt_change_node - structure for tt changes occured * struct batadv_tt_change_node - structure for tt changes occurred
* @list: list node for batadv_priv_tt::changes_list * @list: list node for batadv_priv_tt::changes_list
* @change: holds the actual translation table diff data * @change: holds the actual translation table diff data
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment