pull request: batman-adv 20150825
Subsystems (3)
Hello David,
here you have another batch intended for net-next/linux-4.3.
Most of the patches are about code restyling and beautification, but we also a couple of non critical fixes which didn't make their way through net.
Please pull or let me know of any problem!
Thanks a lot,
Antonio
The following changes since commit 56fff0a01fa056502a28d67cb5a2714d64780415:
Merge branch 'fjes' (2015-08-24 14:06:37 -0700)
are available in the git repository at:
git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem
for you to fetch changes up to 854d2a63de86a769db4dbed75b660f544b3c0c7a:
batman-adv: beautify supported routing algorithm list (2015-08-25 00:12:24 +0200)
----------------------------------------------------------------
Included changes:
- code restyling and beautification
- use int kernel types instead of C99
- update kereldoc
- prevent potential hlist double deletion of VLAN objects
- fix gw bandwidth calculation
- convert list to hlist when needed
- add lockdep_asserts calls in function with lock requirements described in kerneldoc
----------------------------------------------------------------
Marek Lindner (6):
batman-adv: update kernel doc of batadv_tt_global_del_orig_entry()
batman-adv: rename batadv_new_tt_req_node to batadv_tt_req_node_new
batman-adv: convert orig_node->vlan_list to hlist
batman-adv: prevent potential hlist double deletion
batman-adv: convert bat_priv->tt.req_list to hlist
batman-adv: beautify supported routing algorithm list
Sven Eckelmann (9):
batman-adv: Replace C99 int types with kernel type
batman-adv: Fix kerneldoc over 80 column lines
batman-adv: Remove multiple assignment per line
batman-adv: Remove batadv_ types forward declarations
batman-adv: Return EINVAL on invalid gw_bandwidth change
batman-adv: Fix gw_bandwidth calculation on 32 bit systems
batman-adv: Annotate deleting functions with external lock via lockdep
batman-adv: Add lockdep_asserts for documented external locks
batman-adv: Fix conditional statements indentation
net/batman-adv/bat_iv_ogm.c | 102 +++++------ net/batman-adv/bitarray.c | 6 +- net/batman-adv/bitarray.h | 10 +- net/batman-adv/bridge_loop_avoidance.c | 78 ++++----- net/batman-adv/bridge_loop_avoidance.h | 8 +- net/batman-adv/debugfs.h | 1 - net/batman-adv/distributed-arp-table.c | 62 +++---- net/batman-adv/distributed-arp-table.h | 8 +- net/batman-adv/fragmentation.c | 13 +- net/batman-adv/gateway_client.c | 27 +-- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 67 +++++-- net/batman-adv/gateway_common.h | 1 - net/batman-adv/hash.c | 6 +- net/batman-adv/hash.h | 12 +- net/batman-adv/icmp_socket.c | 6 +- net/batman-adv/icmp_socket.h | 1 - net/batman-adv/main.c | 84 ++++----- net/batman-adv/main.h | 48 +++-- net/batman-adv/multicast.c | 35 ++-- net/batman-adv/multicast.h | 2 - net/batman-adv/network-coding.c | 55 +++--- net/batman-adv/network-coding.h | 4 - net/batman-adv/originator.c | 22 +-- net/batman-adv/originator.h | 11 +- net/batman-adv/packet.h | 204 +++++++++++----------- net/batman-adv/routing.c | 24 +-- net/batman-adv/routing.h | 6 +- net/batman-adv/send.c | 8 +- net/batman-adv/send.h | 11 +- net/batman-adv/soft-interface.c | 26 ++- net/batman-adv/soft-interface.h | 4 - net/batman-adv/sysfs.c | 4 +- net/batman-adv/sysfs.h | 2 - net/batman-adv/translation-table.c | 308 ++++++++++++++++++--------------- net/batman-adv/translation-table.h | 31 ++-- net/batman-adv/types.h | 113 ++++++------ 37 files changed, 733 insertions(+), 679 deletions(-)
PATCH 1/15 batman-adv: Replace C99 int types with kernel type
From: Sven Eckelmann <[email protected]>
(s|u)(8|16|32|64) are the preferred types in the kernel. The use of the standard C99 types u?int(8|16|32|64)_t are objected by some people and even checkpatch now warns about using them.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/bat_iv_ogm.c | 94 +++++++------- net/batman-adv/bitarray.c | 6 +- net/batman-adv/bitarray.h | 10 +- net/batman-adv/bridge_loop_avoidance.c | 72 ++++++----- net/batman-adv/bridge_loop_avoidance.h | 5 +- net/batman-adv/distributed-arp-table.c | 59 +++++---- net/batman-adv/distributed-arp-table.h | 8 +- net/batman-adv/fragmentation.c | 10 +- net/batman-adv/gateway_client.c | 14 +-- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 11 +- net/batman-adv/hash.c | 6 +- net/batman-adv/hash.h | 12 +- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/main.c | 69 +++++----- net/batman-adv/main.h | 48 ++++--- net/batman-adv/multicast.c | 16 +-- net/batman-adv/network-coding.c | 44 ++++--- net/batman-adv/originator.c | 15 ++- net/batman-adv/originator.h | 11 +- net/batman-adv/packet.h | 204 +++++++++++++++--------------- net/batman-adv/routing.c | 24 ++-- net/batman-adv/routing.h | 2 +- net/batman-adv/send.c | 8 +- net/batman-adv/send.h | 8 +- net/batman-adv/soft-interface.c | 26 ++-- net/batman-adv/sysfs.c | 4 +- net/batman-adv/translation-table.c | 224 ++++++++++++++++----------------- net/batman-adv/translation-table.h | 29 +++-- net/batman-adv/types.h | 105 ++++++++-------- 30 files changed, 563 insertions(+), 585 deletions(-)
net/batman-adv/bat_iv_ogm.c +46 -48
@@ -77,8 +77,7 @@ enum batadv_dup_status {* @lq_index: index to store the value at * @value: value to store in the ring buffer */ -static void batadv_ring_buffer_set (uint8_t lq_recv[],uint8_t *lq_index, -uint8_t value) +static void batadv_ring_buffer_set (u8 lq_recv[],u8 *lq_index,u8 value) { lq_recv[*lq_index] = value; *lq_index = (*lq_index +1 ) %BATADV_TQ_GLOBAL_WINDOW_SIZE ;
@@ -91,12 +90,12 @@ static void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index,* * Returns computed average value. */ -static uint8_t batadv_ring_buffer_avg (const uint8_t lq_recv[]) +static u8 batadv_ring_buffer_avg (const u8 lq_recv[]) { -const uint8_t *ptr; -uint16_t count =0 ; -uint16_t i =0 ; -uint16_t sum =0 ; +const u8 *ptr; +u16 count =0 ; +u16 i =0 ; +u16 sum =0 ; ptr = lq_recv;
@@ -113,7 +112,7 @@ static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[])if (count ==0 )return 0 ; -return (uint8_t )(sum / count); +return (u8)(sum / count); }/**
@@ -155,14 +154,14 @@ static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node,kfree (orig_node->bat_iv.bcast_own); orig_node->bat_iv.bcast_own = data_ptr; - data_ptr =kmalloc_array (max_if_num,sizeof (uint8_t ),GFP_ATOMIC ); + data_ptr =kmalloc_array (max_if_num,sizeof (u8),GFP_ATOMIC );if (!data_ptr) {kfree (orig_node->bat_iv.bcast_own); goto unlock; }memcpy (data_ptr, orig_node->bat_iv.bcast_own_sum, - (max_if_num -1 ) *sizeof (uint8_t )); + (max_if_num -1 ) *sizeof (u8));kfree (orig_node->bat_iv.bcast_own_sum); orig_node->bat_iv.bcast_own_sum = data_ptr;
@@ -215,19 +214,19 @@ free_bcast_own:if (max_if_num ==0 ) goto free_own_sum; - data_ptr =kmalloc_array (max_if_num,sizeof (uint8_t ),GFP_ATOMIC ); + data_ptr =kmalloc_array (max_if_num,sizeof (u8),GFP_ATOMIC );if (!data_ptr) {kfree (orig_node->bat_iv.bcast_own); goto unlock; }memcpy (data_ptr, orig_node->bat_iv.bcast_own_sum, - del_if_num *sizeof (uint8_t )); + del_if_num *sizeof (u8)); - if_offset = (del_if_num +1 ) *sizeof (uint8_t ); -memcpy ((char *)data_ptr + del_if_num *sizeof (uint8_t ), + if_offset = (del_if_num +1 ) *sizeof (u8); +memcpy ((char *)data_ptr + del_if_num *sizeof (u8), orig_node->bat_iv.bcast_own_sum + if_offset, - (max_if_num - del_if_num) *sizeof (uint8_t )); + (max_if_num - del_if_num) *sizeof (u8)); free_own_sum:kfree (orig_node->bat_iv.bcast_own_sum);
@@ -250,7 +249,7 @@ unlock:* If the object does not exists it is created an initialised. */ static struct batadv_orig_node * -batadv_iv_ogm_orig_get (struct batadv_priv *bat_priv,const uint8_t *addr) +batadv_iv_ogm_orig_get (struct batadv_priv *bat_priv,const u8 *addr) {struct batadv_orig_node *orig_node;int size, hash_added;
@@ -270,7 +269,7 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const uint8_t *addr)if (!orig_node->bat_iv.bcast_own) goto free_orig_node; - size = bat_priv->num_ifaces *sizeof (uint8_t ); + size = bat_priv->num_ifaces *sizeof (u8); orig_node->bat_iv.bcast_own_sum =kzalloc (size,GFP_ATOMIC );if (!orig_node->bat_iv.bcast_own_sum) goto free_orig_node;
@@ -293,7 +292,7 @@ free_orig_node:static struct batadv_neigh_node *batadv_iv_ogm_neigh_new (struct batadv_hard_iface *hard_iface, -const uint8_t *neigh_addr, +const u8 *neigh_addr,struct batadv_orig_node *orig_node,struct batadv_orig_node *orig_neigh) {
@@ -339,7 +338,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) {struct batadv_ogm_packet *batadv_ogm_packet;unsigned char *ogm_buff; -uint32_t random_seqno; +u32 random_seqno;/* randomize initial seqno to avoid collision */ get_random_bytes (&random_seqno,sizeof (random_seqno));
@@ -411,8 +410,7 @@ static unsigned long batadv_iv_ogm_fwd_send_time(void) }/* apply hop penalty for a normal link */ -static uint8_t batadv_hop_penalty (uint8_t tq, -const struct batadv_priv *bat_priv) +static u8 batadv_hop_penalty (u8 tq,const struct batadv_priv *bat_priv) {int hop_penalty =atomic_read (&bat_priv->hop_penalty);int new_tq;
@@ -442,11 +440,11 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet, {struct batadv_priv *bat_priv =netdev_priv (hard_iface->soft_iface);const char *fwd_str; -uint8_t packet_num; -int16_t buff_pos; +u8 packet_num; +s16 buff_pos;struct batadv_ogm_packet *batadv_ogm_packet;struct sk_buff *skb; -uint8_t *packet_pos; +u8 *packet_pos;if (hard_iface->if_status !=BATADV_IF_ACTIVE )return ;
@@ -837,7 +835,7 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, struct batadv_hard_iface *if_outgoing) {struct batadv_priv *bat_priv =netdev_priv (if_incoming->soft_iface); -uint16_t tvlv_len; +u16 tvlv_len;if (batadv_ogm_packet->ttl <=1 ) {batadv_dbg (BATADV_DBG_BATMAN , bat_priv,"ttl exceeded\n" );
@@ -896,9 +894,9 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface)struct hlist_head *head;struct batadv_orig_node *orig_node;unsigned long *word; -uint32_t i; +u32 i;size_t word_index; -uint8_t *w; +u8 *w;int if_num;for (i =0 ; i < hash->size; i++) {
@@ -927,8 +925,8 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)struct batadv_ogm_packet *batadv_ogm_packet;struct batadv_hard_iface *primary_if, *tmp_hard_iface;int *ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len; -uint32_t seqno; -uint16_t tvlv_len =0 ; +u32 seqno; +u16 tvlv_len =0 ;unsigned long send_time; primary_if =batadv_primary_if_get_selected (bat_priv);
@@ -947,7 +945,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_ogm_packet->tvlv_len =htons (tvlv_len);/* change sequence number to network order */ - seqno = (uint32_t )atomic_read (&hard_iface->bat_iv.ogm_seqno); + seqno = (u32 )atomic_read (&hard_iface->bat_iv.ogm_seqno); batadv_ogm_packet->seqno =htonl (seqno);atomic_inc (&hard_iface->bat_iv.ogm_seqno);
@@ -1010,9 +1008,9 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,struct batadv_neigh_node *router =NULL ;struct batadv_orig_node *orig_node_tmp;int if_num; -uint8_t sum_orig, sum_neigh; -uint8_t *neigh_addr; -uint8_t tq_avg; +u8 sum_orig, sum_neigh; +u8 *neigh_addr; +u8 tq_avg;batadv_dbg (BATADV_DBG_BATMAN , bat_priv,"update_originator(): Searching and updating originator entry of received packet\n" );
@@ -1164,8 +1162,8 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,struct batadv_priv *bat_priv =netdev_priv (if_incoming->soft_iface);struct batadv_neigh_node *neigh_node =NULL , *tmp_neigh_node;struct batadv_neigh_ifinfo *neigh_ifinfo; -uint8_t total_count; -uint8_t orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own; +u8 total_count; +u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own;unsigned int neigh_rq_inv_cube, neigh_rq_max_cube;int tq_asym_penalty, inv_asym_penalty, if_num, ret =0 ;unsigned int combined_tq;
@@ -1311,13 +1309,13 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,struct batadv_neigh_node *neigh_node;struct batadv_neigh_ifinfo *neigh_ifinfo;int is_dup; -int32_t seq_diff; +s32 seq_diff;int need_update =0 ;int set_mark;enum batadv_dup_status ret =BATADV_NO_DUP ; -uint32_t seqno =ntohl (batadv_ogm_packet->seqno); -uint8_t *neigh_addr; -uint8_t packet_count; +u32 seqno =ntohl (batadv_ogm_packet->seqno); +u8 *neigh_addr; +u8 packet_count;unsigned long *bitmap; orig_node =batadv_iv_ogm_orig_get (bat_priv, batadv_ogm_packet->orig);
@@ -1418,7 +1416,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,bool sameseq, similar_ttl;struct sk_buff *skb_priv;struct ethhdr *ethhdr; -uint8_t *prev_sender; +u8 *prev_sender;int is_bidirect;/* create a private copy of the skb, as some functions change tq value
@@ -1600,7 +1598,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,struct batadv_orig_node *orig_neigh_node, *orig_node;struct batadv_hard_iface *hard_iface;struct batadv_ogm_packet *ogm_packet; -uint32_t if_incoming_seqno; +u32 if_incoming_seqno;bool has_directlink_flag;struct ethhdr *ethhdr;bool is_my_oldorig = false;
@@ -1673,9 +1671,9 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,if (is_my_orig) {unsigned long *word;int offset; -int32_t bit_pos; -int16_t if_num; -uint8_t *weight; +s32 bit_pos; +s16 if_num; +u8 *weight; orig_neigh_node =batadv_iv_ogm_orig_get (bat_priv, ethhdr->h_source);
@@ -1751,7 +1749,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, {struct batadv_priv *bat_priv =netdev_priv (if_incoming->soft_iface);struct batadv_ogm_packet *ogm_packet; -uint8_t *packet_pos; +u8 *packet_pos;int ogm_offset;bool ret;
@@ -1835,7 +1833,7 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv,unsigned long last_seen_jiffies;struct hlist_head *head;int batman_count =0 ; -uint32_t i; +u32 i; seq_printf(seq, " %-15s %s (%s/%i) %17s [%10s]: %20s ...\n", "Originator", "last-seen", "#", BATADV_TQ_MAX_VALUE,
@@ -1903,7 +1901,7 @@ static int batadv_iv_ogm_neigh_cmp(struct batadv_neigh_node *neigh1, struct batadv_hard_iface *if_outgoing2) {struct batadv_neigh_ifinfo *neigh1_ifinfo, *neigh2_ifinfo; -uint8_t tq1, tq2; +u8 tq1, tq2;int diff; neigh1_ifinfo =batadv_neigh_ifinfo_get (neigh1, if_outgoing1);
@@ -1945,7 +1943,7 @@ batadv_iv_ogm_neigh_is_eob(struct batadv_neigh_node *neigh1, struct batadv_hard_iface *if_outgoing2) {struct batadv_neigh_ifinfo *neigh1_ifinfo, *neigh2_ifinfo; -uint8_t tq1, tq2; +u8 tq1, tq2;bool ret; neigh1_ifinfo =batadv_neigh_ifinfo_get (neigh1, if_outgoing1);
net/batman-adv/bitarray.c +3 -3
@@ -21,7 +21,7 @@#include <linux/bitmap.h> /* shift the packet array by n places. */ -static void batadv_bitmap_shift_left (unsigned long *seq_bits,int32_t n) +static void batadv_bitmap_shift_left (unsigned long *seq_bits,s32 n) {if (n <=0 || n >=BATADV_TQ_LOCAL_WINDOW_SIZE )return ;
@@ -35,8 +35,8 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n)* 1 if the window was moved (either new or very old) * 0 if the window was not moved/shifted. */ -int batadv_bit_get_packet (void *priv,unsigned long *seq_bits, -int32_t seq_num_diff,int set_mark) +int batadv_bit_get_packet (void *priv,unsigned long *seq_bits,s32 seq_num_diff, +int set_mark) {struct batadv_priv *bat_priv = priv;
net/batman-adv/bitarray.h +5 -5
@@ -28,9 +28,9 @@* and curr_seqno is within range of last_seqno. Otherwise returns 0. */ static inline int batadv_test_bit (const unsigned long *seq_bits, -uint32_t last_seqno,uint32_t curr_seqno) +u32 last_seqno,u32 curr_seqno) { -int32_t diff; +s32 diff; diff = last_seqno - curr_seqno;if (diff <0 || diff >=BATADV_TQ_LOCAL_WINDOW_SIZE )
@@ -39,7 +39,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits, }/* turn corresponding bit on, so we can remember that we got the packet */ -static inline void batadv_set_bit (unsigned long *seq_bits,int32_t n) +static inline void batadv_set_bit (unsigned long *seq_bits,s32 n) {/* if too old, just drop it */ if (n <0 || n >=BATADV_TQ_LOCAL_WINDOW_SIZE )
@@ -51,7 +51,7 @@ static inline void batadv_set_bit(unsigned long *seq_bits, int32_t n)/* receive and process one packet, returns 1 if received seq_num is considered * new, 0 if old */ -int batadv_bit_get_packet (void *priv,unsigned long *seq_bits, -int32_t seq_num_diff,int set_mark); +int batadv_bit_get_packet (void *priv,unsigned long *seq_bits,s32 seq_num_diff, +int set_mark);#endif /* _NET_BATMAN_ADV_BITARRAY_H_ */
net/batman-adv/bridge_loop_avoidance.c +35 -37
226 lines not on this page · raw message
net/batman-adv/bridge_loop_avoidance.h +2 -3
@@ -38,7 +38,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb,int batadv_bla_claim_table_seq_print_text (struct seq_file *seq,void *offset);int batadv_bla_backbone_table_seq_print_text (struct seq_file *seq,void *offset); -bool batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv,uint8_t *orig, +bool batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv,u8 *orig,unsigned short vid);int batadv_bla_check_bcast_duplist (struct batadv_priv *bat_priv,struct sk_buff *skb);
@@ -84,8 +84,7 @@ static inline int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, }static inline bool batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv, -uint8_t *orig, -unsigned short vid) +u8 *orig,unsigned short vid) {return false; }
net/batman-adv/distributed-arp-table.c +29 -30
171 lines not on this page · raw message
net/batman-adv/distributed-arp-table.h +4 -4
@@ -54,7 +54,7 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,static inline void batadv_dat_init_orig_node_addr (struct batadv_orig_node *orig_node) { -uint32_t addr; +u32 addr; addr =batadv_choose_orig (orig_node->orig,BATADV_DAT_ADDR_MAX ); orig_node->dat_addr = (batadv_dat_addr_t )addr;
@@ -69,7 +69,7 @@ static inline void batadv_dat_init_own_addr(struct batadv_priv *bat_priv, struct batadv_hard_iface *primary_if) { - uint32_t addr; + u32 addr; addr =batadv_choose_orig (primary_if->net_dev->dev_addr,BATADV_DAT_ADDR_MAX );
@@ -89,7 +89,7 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset);* Updates the ethtool statistics for the received packet if it is a DAT subtype */ static inline void batadv_dat_inc_counter (struct batadv_priv *bat_priv, -uint8_t subtype) +u8 subtype) {switch (subtype) {case BATADV_P_DAT_DHT_GET :
@@ -169,7 +169,7 @@ static inline void batadv_dat_free(struct batadv_priv *bat_priv) }static inline void batadv_dat_inc_counter (struct batadv_priv *bat_priv, -uint8_t subtype) +u8 subtype) { }
net/batman-adv/fragmentation.c +5 -5
@@ -66,7 +66,7 @@ void batadv_frag_purge_orig(struct batadv_orig_node *orig_node, bool (*check_cb)(struct batadv_frag_table_entry *)) {struct batadv_frag_table_entry *chain; -uint8_t i; +u8 i;for (i =0 ; i <BATADV_FRAG_BUFFER_COUNT ; i++) { chain = &orig_node->fragments[i];
@@ -110,7 +110,7 @@ static int batadv_frag_size_limit(void)* without searching for the right position. */ static bool batadv_frag_init_chain (struct batadv_frag_table_entry *chain, -uint16_t seqno) +u16 seqno) {if (chain->seqno == seqno)return false;
@@ -145,8 +145,8 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node,struct batadv_frag_list_entry *frag_entry_new =NULL , *frag_entry_curr;struct batadv_frag_list_entry *frag_entry_last =NULL ;struct batadv_frag_packet *frag_packet; -uint8_t bucket; -uint16_t seqno, hdr_size =sizeof (struct batadv_frag_packet ); +u8 bucket; +u16 seqno, hdr_size =sizeof (struct batadv_frag_packet );bool ret = false;/* Linearize packet to avoid linearizing 16 packets in a row when doing
@@ -351,7 +351,7 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,struct batadv_orig_node *orig_node_dst =NULL ;struct batadv_neigh_node *neigh_node =NULL ;struct batadv_frag_packet *packet; -uint16_t total_size; +u16 total_size;bool ret = false; packet = (struct batadv_frag_packet *)skb->data;
net/batman-adv/gateway_client.c +7 -7
@@ -153,9 +153,9 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv)struct batadv_neigh_node *router;struct batadv_neigh_ifinfo *router_ifinfo;struct batadv_gw_node *gw_node, *curr_gw =NULL ; -uint64_t max_gw_factor =0 , tmp_gw_factor =0 ; -uint8_t max_tq =0 ; -uint8_t tq_avg; +u64 max_gw_factor =0 , tmp_gw_factor =0 ; +u8 max_tq =0 ; +u8 tq_avg;struct batadv_orig_node *orig_node;rcu_read_lock ();
@@ -348,7 +348,7 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv,struct batadv_neigh_ifinfo *router_gw_tq =NULL ;struct batadv_orig_node *curr_gw_orig;struct batadv_neigh_node *router_gw =NULL , *router_orig =NULL ; -uint8_t gw_tq_avg, orig_tq_avg; +u8 gw_tq_avg, orig_tq_avg; curr_gw_orig =batadv_gw_get_selected_orig (bat_priv);if (!curr_gw_orig)
@@ -688,7 +688,7 @@ out:*/ enum batadv_dhcp_recipient batadv_gw_dhcp_recipient_get (struct sk_buff *skb,unsigned int *header_len, -uint8_t *chaddr) +u8 *chaddr) {enum batadv_dhcp_recipient ret =BATADV_DHCP_NO ;struct ethhdr *ethhdr;
@@ -698,7 +698,7 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,struct vlan_ethhdr *vhdr;int chaddr_offset;__be16 proto; -uint8_t *p; +u8 *p;/* check for ethernet header */ if (!pskb_may_pull (skb, *header_len +ETH_HLEN ))
@@ -814,7 +814,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,struct batadv_neigh_ifinfo *curr_ifinfo, *old_ifinfo;struct ethhdr *ethhdr = (struct ethhdr *)skb->data;bool out_of_range = false; -uint8_t curr_tq_avg; +u8 curr_tq_avg;unsigned short vid; vid =batadv_get_vid (skb,0 );
net/batman-adv/gateway_client.h +1 -1
@@ -43,6 +43,6 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset);bool batadv_gw_out_of_range (struct batadv_priv *bat_priv,struct sk_buff *skb);enum batadv_dhcp_recipient batadv_gw_dhcp_recipient_get (struct sk_buff *skb,unsigned int *header_len, -uint8_t *chaddr); +u8 *chaddr);#endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */
net/batman-adv/gateway_common.c +5 -6
@@ -39,7 +39,7 @@* Returns false on parse error and true otherwise. */ static bool batadv_parse_gw_bandwidth (struct net_device *net_dev,char *buff, -uint32_t *down,uint32_t *up) +u32 *down,u32 *up) {enum batadv_bandwidth_units bw_unit_type =BATADV_BW_UNIT_KBIT ;char *slash_ptr, *tmp_ptr;
@@ -124,7 +124,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff,void batadv_gw_tvlv_container_update (struct batadv_priv *bat_priv) {struct batadv_tvlv_gateway_data gw; -uint32_t down, up; +u32 down, up;char gw_mode; gw_mode =atomic_read (&bat_priv->gw_mode);
@@ -149,7 +149,7 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count) {struct batadv_priv *bat_priv =netdev_priv (net_dev); -uint32_t down_curr, up_curr, down_new =0 , up_new =0 ; +u32 down_curr, up_curr, down_new =0 , up_new =0 ;bool ret; down_curr = (unsigned int )atomic_read (&bat_priv->gw.bandwidth_down);
@@ -195,9 +195,8 @@ end:*/ static void batadv_gw_tvlv_ogm_handler_v1 (struct batadv_priv *bat_priv,struct batadv_orig_node *orig, -uint8_t flags, -void *tvlv_value, -uint16_t tvlv_value_len) +u8 flags, +void *tvlv_value,u16 tvlv_value_len) {struct batadv_tvlv_gateway_data gateway, *gateway_ptr;
net/batman-adv/hash.c +3 -3
@@ -25,7 +25,7 @@/* clears the hash */ static void batadv_hash_init (struct batadv_hashtable *hash) { -uint32_t i; +u32 i;for (i =0 ; i < hash->size; i++) {INIT_HLIST_HEAD (&hash->table[i]);
@@ -42,7 +42,7 @@ void batadv_hash_destroy(struct batadv_hashtable *hash) }/* allocates and clears the hash */ -struct batadv_hashtable *batadv_hash_new (uint32_t size) +struct batadv_hashtable *batadv_hash_new (u32 size) {struct batadv_hashtable *hash;
@@ -73,7 +73,7 @@ free_hash:void batadv_hash_set_lock_class (struct batadv_hashtable *hash,struct lock_class_key *key) { -uint32_t i; +u32 i;for (i =0 ; i < hash->size; i++)lockdep_set_class (&hash->list_locks[i], key);
net/batman-adv/hash.h +6 -6
@@ -39,17 +39,17 @@ typedef int (*batadv_hashdata_compare_cb)(const struct hlist_node *,* based on the key in the data of the first * argument and the size the second */ -typedef uint32_t (*batadv_hashdata_choose_cb )(const void *,uint32_t ); +typedef u32 (*batadv_hashdata_choose_cb )(const void *,u32 );typedef void (*batadv_hashdata_free_cb )(struct hlist_node *,void *);struct batadv_hashtable {struct hlist_head *table;/* the hashtable itself with the buckets */ spinlock_t *list_locks;/* spinlock for each hash list entry */ -uint32_t size;/* size of hashtable */ +u32 size;/* size of hashtable */ };/* allocates and clears the hash */ -struct batadv_hashtable *batadv_hash_new (uint32_t size); +struct batadv_hashtable *batadv_hash_new (u32 size);/* set class key for all locks */ void batadv_hash_set_lock_class(struct batadv_hashtable *hash,
@@ -69,7 +69,7 @@ static inline void batadv_hash_delete(struct batadv_hashtable *hash,struct hlist_head *head;struct hlist_node *node, *node_tmp;spinlock_t *list_lock;/* spinlock to protect write access */ -uint32_t i; +u32 i;for (i =0 ; i < hash->size; i++) { head = &hash->table[i];
@@ -105,7 +105,7 @@ static inline int batadv_hash_add(struct batadv_hashtable *hash,const void *data, struct hlist_node *data_node) { - uint32_t index; + u32 index;int ret =-1 ;struct hlist_head *head;struct hlist_node *node;
@@ -149,7 +149,7 @@ static inline void *batadv_hash_remove(struct batadv_hashtable *hash,batadv_hashdata_choose_cb choose, void *data) { - uint32_t index; + u32 index;struct hlist_node *node;struct hlist_head *head;void *data_save =NULL ;
net/batman-adv/icmp_socket.c +1 -1
@@ -183,7 +183,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff,struct batadv_orig_node *orig_node =NULL ;struct batadv_neigh_node *neigh_node =NULL ;size_t packet_len =sizeof (struct batadv_icmp_packet ); -uint8_t *addr; +u8 *addr;if (len <sizeof (struct batadv_icmp_header )) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
net/batman-adv/main.c +33 -36
188 lines not on this page · raw message
net/batman-adv/main.h +23 -25
96 lines not on this page · raw message
net/batman-adv/multicast.c +8 -8
@@ -89,7 +89,7 @@ static int batadv_mcast_mla_softif_get(struct net_device *dev,* Returns true if the given address is already in the given list. * Otherwise returns false. */ -static bool batadv_mcast_mla_is_duplicate (uint8_t *mcast_addr, +static bool batadv_mcast_mla_is_duplicate (u8 *mcast_addr,struct hlist_head *mcast_list) {struct batadv_hw_addr *mcast_entry;
@@ -595,7 +595,7 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,*/ static void batadv_mcast_want_unsnoop_update (struct batadv_priv *bat_priv,struct batadv_orig_node *orig, -uint8_t mcast_flags) +u8 mcast_flags) {struct hlist_node *node = &orig->mcast_want_all_unsnoopables_node;struct hlist_head *head = &bat_priv->mcast.want_all_unsnoopables_list;
@@ -638,7 +638,7 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,*/ static void batadv_mcast_want_ipv4_update (struct batadv_priv *bat_priv,struct batadv_orig_node *orig, -uint8_t mcast_flags) +u8 mcast_flags) {struct hlist_node *node = &orig->mcast_want_all_ipv4_node;struct hlist_head *head = &bat_priv->mcast.want_all_ipv4_list;
@@ -681,7 +681,7 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,*/ static void batadv_mcast_want_ipv6_update (struct batadv_priv *bat_priv,struct batadv_orig_node *orig, -uint8_t mcast_flags) +u8 mcast_flags) {struct hlist_node *node = &orig->mcast_want_all_ipv6_node;struct hlist_head *head = &bat_priv->mcast.want_all_ipv6_list;
@@ -721,17 +721,17 @@ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,*/ static void batadv_mcast_tvlv_ogm_handler_v1 (struct batadv_priv *bat_priv,struct batadv_orig_node *orig, -uint8_t flags, +u8 flags,void *tvlv_value, -uint16_t tvlv_value_len) +u16 tvlv_value_len) {bool orig_mcast_enabled = !(flags &BATADV_TVLV_HANDLER_OGM_CIFNOTFND ); -uint8_t mcast_flags =BATADV_NO_FLAGS ; +u8 mcast_flags =BATADV_NO_FLAGS ;bool orig_initialized;if (orig_mcast_enabled && tvlv_value && (tvlv_value_len >=sizeof (mcast_flags))) - mcast_flags = *(uint8_t *)tvlv_value; + mcast_flags = *(u8 *)tvlv_value;spin_lock_bh (&orig->mcast_handler_lock); orig_initialized = test_bit(BATADV_ORIG_CAPA_HAS_MCAST,
net/batman-adv/network-coding.c +21 -23
137 lines not on this page · raw message
net/batman-adv/originator.c +7 -8
@@ -452,8 +452,7 @@ out:*/ struct batadv_neigh_node *batadv_neigh_node_new (struct batadv_hard_iface *hard_iface, -const uint8_t *neigh_addr, -struct batadv_orig_node *orig_node) +const u8 *neigh_addr,struct batadv_orig_node *orig_node) {struct batadv_neigh_node *neigh_node;
@@ -489,7 +488,7 @@ out:struct batadv_neigh_node *batadv_neigh_node_get (const struct batadv_orig_node *orig_node,const struct batadv_hard_iface *hard_iface, -const uint8_t *addr) +const u8 *addr) {struct batadv_neigh_node *tmp_neigh_node, *res =NULL ;
@@ -624,7 +623,7 @@ void batadv_originator_free(struct batadv_priv *bat_priv)struct hlist_head *head;spinlock_t *list_lock;/* spinlock to protect write access */ struct batadv_orig_node *orig_node; -uint32_t i; +u32 i;if (!hash)return ;
@@ -659,7 +658,7 @@ void batadv_originator_free(struct batadv_priv *bat_priv)* Returns the newly created object or NULL on failure. */ struct batadv_orig_node *batadv_orig_node_new (struct batadv_priv *bat_priv, -const uint8_t *addr) +const u8 *addr) {struct batadv_orig_node *orig_node;struct batadv_orig_node_vlan *vlan;
@@ -981,7 +980,7 @@ static void _batadv_purge_orig(struct batadv_priv *bat_priv)struct hlist_head *head;spinlock_t *list_lock;/* spinlock to protect write access */ struct batadv_orig_node *orig_node; -uint32_t i; +u32 i;if (!hash)return ;
@@ -1115,7 +1114,7 @@ int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface,struct batadv_hashtable *hash = bat_priv->orig_hash;struct hlist_head *head;struct batadv_orig_node *orig_node; -uint32_t i; +u32 i;int ret;/* resize all orig nodes because orig_node->bcast_own(_sum) depend on
@@ -1152,7 +1151,7 @@ int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface,struct batadv_hard_iface *hard_iface_tmp;struct batadv_orig_node *orig_node;struct batadv_algo_ops *bao = bat_priv->bat_algo_ops; -uint32_t i; +u32 i;int ret;/* resize all orig nodes because orig_node->bcast_own(_sum) depend on
net/batman-adv/originator.h +5 -6
@@ -40,15 +40,14 @@ void batadv_purge_orig_ref(struct batadv_priv *bat_priv);void batadv_orig_node_free_ref (struct batadv_orig_node *orig_node);void batadv_orig_node_free_ref_now (struct batadv_orig_node *orig_node);struct batadv_orig_node *batadv_orig_node_new (struct batadv_priv *bat_priv, -const uint8_t *addr); +const u8 *addr);struct batadv_neigh_node *batadv_neigh_node_get (const struct batadv_orig_node *orig_node,const struct batadv_hard_iface *hard_iface, -const uint8_t *addr); +const u8 *addr);struct batadv_neigh_node *batadv_neigh_node_new (struct batadv_hard_iface *hard_iface, -const uint8_t *neigh_addr, -struct batadv_orig_node *orig_node); +const u8 *neigh_addr,struct batadv_orig_node *orig_node);void batadv_neigh_node_free_ref (struct batadv_neigh_node *neigh_node);struct batadv_neigh_node * batadv_orig_router_get(struct batadv_orig_node *orig_node,
@@ -86,9 +85,9 @@ 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 */ -static inline uint32_t batadv_choose_orig (const void *data,uint32_t size) +static inline u32 batadv_choose_orig (const void *data,u32 size) { -uint32_t hash =0 ; +u32 hash =0 ; hash =jhash (data,ETH_ALEN , hash);return hash % size;
net/batman-adv/packet.h +102 -102
311 lines not on this page · raw message
net/batman-adv/routing.c +12 -12
@@ -145,7 +145,7 @@ out:* 0 if the packet is to be accepted * 1 if the packet is to be ignored. */ -int batadv_window_protected (struct batadv_priv *bat_priv,int32_t seq_num_diff, +int batadv_window_protected (struct batadv_priv *bat_priv,s32 seq_num_diff,unsigned long *last_reset) { if (seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE ||
@@ -653,19 +653,19 @@ out:static bool batadv_reroute_unicast_packet (struct batadv_priv *bat_priv,struct batadv_unicast_packet *unicast_packet, -uint8_t *dst_addr,unsigned short vid) +u8 *dst_addr,unsigned short vid) {struct batadv_orig_node *orig_node =NULL ;struct batadv_hard_iface *primary_if =NULL ;bool ret = false; -uint8_t *orig_addr, orig_ttvn; +u8 *orig_addr, orig_ttvn;if (batadv_is_my_client (bat_priv, dst_addr, vid)) { primary_if =batadv_primary_if_get_selected (bat_priv);if (!primary_if) goto out; orig_addr = primary_if->net_dev->dev_addr; - orig_ttvn = (uint8_t )atomic_read (&bat_priv->tt.vn); + orig_ttvn = (u8 )atomic_read (&bat_priv->tt.vn); }else { orig_node =batadv_transtable_search (bat_priv,NULL , dst_addr, vid);
@@ -676,7 +676,7 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, goto out; orig_addr = orig_node->orig; - orig_ttvn = (uint8_t )atomic_read (&orig_node->last_ttvn); + orig_ttvn = (u8 )atomic_read (&orig_node->last_ttvn); }/* update the packet header */
@@ -698,7 +698,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,struct batadv_unicast_packet *unicast_packet;struct batadv_hard_iface *primary_if;struct batadv_orig_node *orig_node; -uint8_t curr_ttvn, old_ttvn; +u8 curr_ttvn, old_ttvn;struct ethhdr *ethhdr;unsigned short vid;int is_old_ttvn;
@@ -740,7 +740,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,* value is used later to check if the node which sent (or re-routed * last time) the packet had an updated information or not */ - curr_ttvn = (uint8_t )atomic_read (&bat_priv->tt.vn); + curr_ttvn = (u8 )atomic_read (&bat_priv->tt.vn);if (!batadv_is_my_mac (bat_priv, unicast_packet->dest)) { orig_node =batadv_orig_hash_find (bat_priv, unicast_packet->dest);
@@ -751,7 +751,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,if (!orig_node)return 0 ; - curr_ttvn = (uint8_t )atomic_read (&orig_node->last_ttvn); + curr_ttvn = (u8 )atomic_read (&orig_node->last_ttvn);batadv_orig_node_free_ref (orig_node); }
@@ -833,7 +833,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,struct batadv_priv *bat_priv =netdev_priv (recv_if->soft_iface);struct batadv_unicast_packet *unicast_packet;struct batadv_unicast_4addr_packet *unicast_4addr_packet; -uint8_t *orig_addr; +u8 *orig_addr;struct batadv_orig_node *orig_node =NULL ;int check, hdr_size =sizeof (*unicast_packet);bool is4addr;
@@ -904,7 +904,7 @@ int batadv_recv_unicast_tvlv(struct sk_buff *skb,struct batadv_priv *bat_priv =netdev_priv (recv_if->soft_iface);struct batadv_unicast_tvlv_packet *unicast_tvlv_packet;unsigned char *tvlv_buff; -uint16_t tvlv_buff_len; +u16 tvlv_buff_len;int hdr_size =sizeof (*unicast_tvlv_packet);int ret =NET_RX_DROP ;
@@ -1007,8 +1007,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,struct ethhdr *ethhdr;int hdr_size =sizeof (*bcast_packet);int ret =NET_RX_DROP ; -int32_t seq_diff; -uint32_t seqno; +s32 seq_diff; +u32 seqno;/* drop packet if it has not necessary minimum size */ if (unlikely (!pskb_may_pull (skb, hdr_size)))
net/batman-adv/routing.h +1 -1
@@ -55,7 +55,7 @@ struct batadv_neigh_node * batadv_find_router(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, struct batadv_hard_iface *recv_if); -int batadv_window_protected (struct batadv_priv *bat_priv,int32_t seq_num_diff, +int batadv_window_protected (struct batadv_priv *bat_priv,s32 seq_num_diff,unsigned long *last_reset);#endif /* _NET_BATMAN_ADV_ROUTING_H_ */
net/batman-adv/send.c +4 -4
@@ -54,7 +54,7 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work);*/ int batadv_send_skb_packet (struct sk_buff *skb,struct batadv_hard_iface *hard_iface, -const uint8_t *dst_addr) +const u8 *dst_addr) {struct batadv_priv *bat_priv =netdev_priv (hard_iface->soft_iface);struct ethhdr *ethhdr;
@@ -172,7 +172,7 @@ batadv_send_skb_push_fill_unicast(struct sk_buff *skb, int hdr_size, struct batadv_orig_node *orig_node) {struct batadv_unicast_packet *unicast_packet; -uint8_t ttvn = (uint8_t )atomic_read (&orig_node->last_ttvn); +u8 ttvn = (u8 )atomic_read (&orig_node->last_ttvn);if (batadv_skb_head_push (skb, hdr_size) <0 )return false;
@@ -343,12 +343,12 @@ out:*/ int batadv_send_skb_via_tt_generic (struct batadv_priv *bat_priv,struct sk_buff *skb,int packet_type, -int packet_subtype,uint8_t *dst_hint, +int packet_subtype,u8 *dst_hint,unsigned short vid) {struct ethhdr *ethhdr = (struct ethhdr *)skb->data;struct batadv_orig_node *orig_node; -uint8_t *src, *dst; +u8 *src, *dst; src = ethhdr->h_source; dst = ethhdr->h_dest;
net/batman-adv/send.h +4 -4
@@ -33,7 +33,7 @@ struct work_struct;int batadv_send_skb_packet (struct sk_buff *skb,struct batadv_hard_iface *hard_iface, -const uint8_t *dst_addr); +const u8 *dst_addr);int batadv_send_skb_to_orig (struct sk_buff *skb,struct batadv_orig_node *orig_node,struct batadv_hard_iface *recv_if);
@@ -56,7 +56,7 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv, unsigned short vid);int batadv_send_skb_via_tt_generic (struct batadv_priv *bat_priv,struct sk_buff *skb,int packet_type, -int packet_subtype,uint8_t *dst_hint, +int packet_subtype,u8 *dst_hint,unsigned short vid);int batadv_send_skb_via_gw (struct batadv_priv *bat_priv,struct sk_buff *skb,unsigned short vid);
@@ -75,7 +75,7 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,* Returns NET_XMIT_DROP in case of error or NET_XMIT_SUCCESS otherwise. */ static inline int batadv_send_skb_via_tt (struct batadv_priv *bat_priv, -struct sk_buff *skb,uint8_t *dst_hint, +struct sk_buff *skb,u8 *dst_hint,unsigned short vid) { return batadv_send_skb_via_tt_generic(bat_priv, skb, BATADV_UNICAST, 0,
@@ -100,7 +100,7 @@ static inline int batadv_send_skb_via_tt(struct batadv_priv *bat_priv,static inline int batadv_send_skb_via_tt_4addr (struct batadv_priv *bat_priv,struct sk_buff *skb,int packet_subtype, -uint8_t *dst_hint, +u8 *dst_hint,unsigned short vid) { return batadv_send_skb_via_tt_generic(bat_priv, skb,
net/batman-adv/soft-interface.c +12 -14
@@ -131,7 +131,7 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)struct batadv_priv *bat_priv =netdev_priv (dev);struct batadv_softif_vlan *vlan;struct sockaddr *addr = p; -uint8_t old_addr[ETH_ALEN ]; +u8 old_addr[ETH_ALEN ];if (!is_valid_ether_addr (addr->sa_data))return -EADDRNOTAVAIL ;
@@ -186,19 +186,19 @@ static int batadv_interface_tx(struct sk_buff *skb,struct batadv_hard_iface *primary_if =NULL ;struct batadv_bcast_packet *bcast_packet;__be16 ethertype =htons (ETH_P_BATMAN ); -static const uint8_t stp_addr[ETH_ALEN ] = {0x01 ,0x80 ,0xC2 ,0x00 , -0x00 ,0x00 }; -static const uint8_t ectp_addr[ETH_ALEN ] = {0xCF ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 }; +static const u8 stp_addr[ETH_ALEN ] = {0x01 ,0x80 ,0xC2 ,0x00 , +0x00 ,0x00 }; +static const u8 ectp_addr[ETH_ALEN ] = {0xCF ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 };enum batadv_dhcp_recipient dhcp_rcp =BATADV_DHCP_NO ; -uint8_t *dst_hint =NULL , chaddr[ETH_ALEN ]; +u8 *dst_hint =NULL , chaddr[ETH_ALEN ];struct vlan_ethhdr *vhdr;unsigned int header_len =0 ;int data_len = skb->len, ret;unsigned long brd_delay =1 ;bool do_bcast = false, client_added;unsigned short vid; -uint32_t seqno; +u32 seqno;int gw_mode;enum batadv_forw_mode forw_mode;struct batadv_orig_node *mcast_single_orig =NULL ;
@@ -750,9 +750,9 @@ static void batadv_softif_destroy_finish(struct work_struct *work)static int batadv_softif_init_late (struct net_device *dev) {struct batadv_priv *bat_priv; -uint32_t random_seqno; +u32 random_seqno;int ret; -size_t cnt_len =sizeof (uint64_t ) *BATADV_CNT_NUM ; +size_t cnt_len =sizeof (u64) *BATADV_CNT_NUM ;batadv_set_lockdep_class (dev);
@@ -763,7 +763,7 @@ static int batadv_softif_init_late(struct net_device *dev)/* batadv_interface_stats() needs to be available as soon as * register_netdevice() has been called */ - bat_priv->bat_counters =__alloc_percpu (cnt_len, __alignof__(uint64_t )); + bat_priv->bat_counters =__alloc_percpu (cnt_len, __alignof__(u64 ));if (!bat_priv->bat_counters)return -ENOMEM ;
@@ -1117,8 +1117,7 @@ static const struct {#endif }; -static void batadv_get_strings (struct net_device *dev,uint32_t stringset, -uint8_t *data) +static void batadv_get_strings (struct net_device *dev,u32 stringset,u8 *data) {if (stringset ==ETH_SS_STATS ) memcpy(data, batadv_counters_strings,
@@ -1126,8 +1125,7 @@ static void batadv_get_strings(struct net_device *dev, uint32_t stringset, }static void batadv_get_ethtool_stats (struct net_device *dev, -struct ethtool_stats *stats, -uint64_t *data) +struct ethtool_stats *stats,u64 *data) {struct batadv_priv *bat_priv =netdev_priv (dev);int i;
net/batman-adv/sysfs.c +2 -2
@@ -457,7 +457,7 @@ static ssize_t batadv_show_gw_bwidth(struct kobject *kobj, struct attribute *attr, char *buff) { struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); -uint32_t down, up; +u32 down, up; down =atomic_read (&bat_priv->gw.bandwidth_down); up =atomic_read (&bat_priv->gw.bandwidth_up);
@@ -512,7 +512,7 @@ static ssize_t batadv_store_isolation_mark(struct kobject *kobj, {struct net_device *net_dev =batadv_kobj_to_netdev (kobj);struct batadv_priv *bat_priv =netdev_priv (net_dev); -uint32_t mark, mask; +u32 mark, mask;char *mask_ptr;/* parse the mask if it has been specified, otherwise assume the mask is
net/batman-adv/translation-table.c +111 -113
676 lines not on this page · raw message
net/batman-adv/translation-table.h +14 -15
@@ -28,38 +28,37 @@ struct net_device;struct seq_file ;int batadv_tt_init (struct batadv_priv *bat_priv); -bool batadv_tt_local_add (struct net_device *soft_iface,const uint8_t *addr, -unsigned short vid,int ifindex,uint32_t mark); -uint16_t batadv_tt_local_remove (struct batadv_priv *bat_priv, -const uint8_t *addr,unsigned short vid, -const char *message,bool roaming); +bool batadv_tt_local_add (struct net_device *soft_iface,const u8 *addr, +unsigned short vid,int ifindex,u32 mark); +u16 batadv_tt_local_remove (struct batadv_priv *bat_priv, +const u8 *addr,unsigned short vid, +const char *message,bool roaming);int batadv_tt_local_seq_print_text (struct seq_file *seq,void *offset);int batadv_tt_global_seq_print_text (struct seq_file *seq,void *offset);void batadv_tt_global_del_orig (struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node, -int32_t match_vid,const char *message); +s32 match_vid,const char *message);int batadv_tt_global_hash_count (struct batadv_priv *bat_priv, -const uint8_t *addr,unsigned short vid); +const u8 *addr,unsigned short vid);struct batadv_orig_node *batadv_transtable_search (struct batadv_priv *bat_priv, -const uint8_t *src, -const uint8_t *addr, +const u8 *src,const u8 *addr,unsigned short vid);void batadv_tt_free (struct batadv_priv *bat_priv); -bool batadv_is_my_client (struct batadv_priv *bat_priv,const uint8_t *addr, +bool batadv_is_my_client (struct batadv_priv *bat_priv,const u8 *addr,unsigned short vid); -bool batadv_is_ap_isolated (struct batadv_priv *bat_priv,uint8_t *src, -uint8_t *dst,unsigned short vid); +bool batadv_is_ap_isolated (struct batadv_priv *bat_priv,u8 *src,u8 *dst, +unsigned short vid);void batadv_tt_local_commit_changes (struct batadv_priv *bat_priv);bool batadv_tt_global_client_is_roaming (struct batadv_priv *bat_priv, -uint8_t *addr,unsigned short vid); +u8 *addr,unsigned short vid);bool batadv_tt_local_client_is_roaming (struct batadv_priv *bat_priv, -uint8_t *addr,unsigned short vid); +u8 *addr,unsigned short vid);void batadv_tt_local_resize_to_mtu (struct net_device *soft_iface);bool batadv_tt_add_temporary_global_entry (struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node,const unsigned char *addr,unsigned short vid);bool batadv_tt_global_is_isolated (struct batadv_priv *bat_priv, -const uint8_t *addr,unsigned short vid); +const u8 *addr,unsigned short vid);#endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */
net/batman-adv/types.h +52 -53
204 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.5.0
Part of the diff is not shown here. View the raw message.
PATCH 1/15 batman-adv: Replace C99 int types with kernel type
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
(s|u)(8|16|32|64) are the preferred types in the kernel. The use of the standard C99 types u?int(8|16|32|64)_t are objected by some people and even checkpatch now warns about using them.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/bat_iv_ogm.c | 94 +++++++------- net/batman-adv/bitarray.c | 6 +- net/batman-adv/bitarray.h | 10 +- net/batman-adv/bridge_loop_avoidance.c | 72 ++++++----- net/batman-adv/bridge_loop_avoidance.h | 5 +- net/batman-adv/distributed-arp-table.c | 59 +++++---- net/batman-adv/distributed-arp-table.h | 8 +- net/batman-adv/fragmentation.c | 10 +- net/batman-adv/gateway_client.c | 14 +-- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 11 +- net/batman-adv/hash.c | 6 +- net/batman-adv/hash.h | 12 +- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/main.c | 69 +++++----- net/batman-adv/main.h | 48 ++++--- net/batman-adv/multicast.c | 16 +-- net/batman-adv/network-coding.c | 44 ++++--- net/batman-adv/originator.c | 15 ++- net/batman-adv/originator.h | 11 +- net/batman-adv/packet.h | 204 +++++++++++++++--------------- net/batman-adv/routing.c | 24 ++-- net/batman-adv/routing.h | 2 +- net/batman-adv/send.c | 8 +- net/batman-adv/send.h | 8 +- net/batman-adv/soft-interface.c | 26 ++-- net/batman-adv/sysfs.c | 4 +- net/batman-adv/translation-table.c | 224 ++++++++++++++++----------------- net/batman-adv/translation-table.h | 29 +++-- net/batman-adv/types.h | 105 ++++++++-------- 30 files changed, 563 insertions(+), 585 deletions(-)
net/batman-adv/bat_iv_ogm.c +46 -48
@@ -77,8 +77,7 @@ enum batadv_dup_status {* @lq_index: index to store the value at * @value: value to store in the ring buffer */ -static void batadv_ring_buffer_set (uint8_t lq_recv[],uint8_t *lq_index, -uint8_t value) +static void batadv_ring_buffer_set (u8 lq_recv[],u8 *lq_index,u8 value) { lq_recv[*lq_index] = value; *lq_index = (*lq_index +1 ) %BATADV_TQ_GLOBAL_WINDOW_SIZE ;
@@ -91,12 +90,12 @@ static void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index,* * Returns computed average value. */ -static uint8_t batadv_ring_buffer_avg (const uint8_t lq_recv[]) +static u8 batadv_ring_buffer_avg (const u8 lq_recv[]) { -const uint8_t *ptr; -uint16_t count =0 ; -uint16_t i =0 ; -uint16_t sum =0 ; +const u8 *ptr; +u16 count =0 ; +u16 i =0 ; +u16 sum =0 ; ptr = lq_recv;
@@ -113,7 +112,7 @@ static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[])if (count ==0 )return 0 ; -return (uint8_t )(sum / count); +return (u8)(sum / count); }/**
@@ -155,14 +154,14 @@ static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node,kfree (orig_node->bat_iv.bcast_own); orig_node->bat_iv.bcast_own = data_ptr; - data_ptr =kmalloc_array (max_if_num,sizeof (uint8_t ),GFP_ATOMIC ); + data_ptr =kmalloc_array (max_if_num,sizeof (u8),GFP_ATOMIC );if (!data_ptr) {kfree (orig_node->bat_iv.bcast_own); goto unlock; }memcpy (data_ptr, orig_node->bat_iv.bcast_own_sum, - (max_if_num -1 ) *sizeof (uint8_t )); + (max_if_num -1 ) *sizeof (u8));kfree (orig_node->bat_iv.bcast_own_sum); orig_node->bat_iv.bcast_own_sum = data_ptr;
@@ -215,19 +214,19 @@ free_bcast_own:if (max_if_num ==0 ) goto free_own_sum; - data_ptr =kmalloc_array (max_if_num,sizeof (uint8_t ),GFP_ATOMIC ); + data_ptr =kmalloc_array (max_if_num,sizeof (u8),GFP_ATOMIC );if (!data_ptr) {kfree (orig_node->bat_iv.bcast_own); goto unlock; }memcpy (data_ptr, orig_node->bat_iv.bcast_own_sum, - del_if_num *sizeof (uint8_t )); + del_if_num *sizeof (u8)); - if_offset = (del_if_num +1 ) *sizeof (uint8_t ); -memcpy ((char *)data_ptr + del_if_num *sizeof (uint8_t ), + if_offset = (del_if_num +1 ) *sizeof (u8); +memcpy ((char *)data_ptr + del_if_num *sizeof (u8), orig_node->bat_iv.bcast_own_sum + if_offset, - (max_if_num - del_if_num) *sizeof (uint8_t )); + (max_if_num - del_if_num) *sizeof (u8)); free_own_sum:kfree (orig_node->bat_iv.bcast_own_sum);
@@ -250,7 +249,7 @@ unlock:* If the object does not exists it is created an initialised. */ static struct batadv_orig_node * -batadv_iv_ogm_orig_get (struct batadv_priv *bat_priv,const uint8_t *addr) +batadv_iv_ogm_orig_get (struct batadv_priv *bat_priv,const u8 *addr) {struct batadv_orig_node *orig_node;int size, hash_added;
@@ -270,7 +269,7 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const uint8_t *addr)if (!orig_node->bat_iv.bcast_own) goto free_orig_node; - size = bat_priv->num_ifaces *sizeof (uint8_t ); + size = bat_priv->num_ifaces *sizeof (u8); orig_node->bat_iv.bcast_own_sum =kzalloc (size,GFP_ATOMIC );if (!orig_node->bat_iv.bcast_own_sum) goto free_orig_node;
@@ -293,7 +292,7 @@ free_orig_node:static struct batadv_neigh_node *batadv_iv_ogm_neigh_new (struct batadv_hard_iface *hard_iface, -const uint8_t *neigh_addr, +const u8 *neigh_addr,struct batadv_orig_node *orig_node,struct batadv_orig_node *orig_neigh) {
@@ -339,7 +338,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) {struct batadv_ogm_packet *batadv_ogm_packet;unsigned char *ogm_buff; -uint32_t random_seqno; +u32 random_seqno;/* randomize initial seqno to avoid collision */ get_random_bytes (&random_seqno,sizeof (random_seqno));
@@ -411,8 +410,7 @@ static unsigned long batadv_iv_ogm_fwd_send_time(void) }/* apply hop penalty for a normal link */ -static uint8_t batadv_hop_penalty (uint8_t tq, -const struct batadv_priv *bat_priv) +static u8 batadv_hop_penalty (u8 tq,const struct batadv_priv *bat_priv) {int hop_penalty =atomic_read (&bat_priv->hop_penalty);int new_tq;
@@ -442,11 +440,11 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet, {struct batadv_priv *bat_priv =netdev_priv (hard_iface->soft_iface);const char *fwd_str; -uint8_t packet_num; -int16_t buff_pos; +u8 packet_num; +s16 buff_pos;struct batadv_ogm_packet *batadv_ogm_packet;struct sk_buff *skb; -uint8_t *packet_pos; +u8 *packet_pos;if (hard_iface->if_status !=BATADV_IF_ACTIVE )return ;
@@ -837,7 +835,7 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, struct batadv_hard_iface *if_outgoing) {struct batadv_priv *bat_priv =netdev_priv (if_incoming->soft_iface); -uint16_t tvlv_len; +u16 tvlv_len;if (batadv_ogm_packet->ttl <=1 ) {batadv_dbg (BATADV_DBG_BATMAN , bat_priv,"ttl exceeded\n" );
@@ -896,9 +894,9 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface)struct hlist_head *head;struct batadv_orig_node *orig_node;unsigned long *word; -uint32_t i; +u32 i;size_t word_index; -uint8_t *w; +u8 *w;int if_num;for (i =0 ; i < hash->size; i++) {
@@ -927,8 +925,8 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)struct batadv_ogm_packet *batadv_ogm_packet;struct batadv_hard_iface *primary_if, *tmp_hard_iface;int *ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len; -uint32_t seqno; -uint16_t tvlv_len =0 ; +u32 seqno; +u16 tvlv_len =0 ;unsigned long send_time; primary_if =batadv_primary_if_get_selected (bat_priv);
@@ -947,7 +945,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_ogm_packet->tvlv_len =htons (tvlv_len);/* change sequence number to network order */ - seqno = (uint32_t )atomic_read (&hard_iface->bat_iv.ogm_seqno); + seqno = (u32 )atomic_read (&hard_iface->bat_iv.ogm_seqno); batadv_ogm_packet->seqno =htonl (seqno);atomic_inc (&hard_iface->bat_iv.ogm_seqno);
@@ -1010,9 +1008,9 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,struct batadv_neigh_node *router =NULL ;struct batadv_orig_node *orig_node_tmp;int if_num; -uint8_t sum_orig, sum_neigh; -uint8_t *neigh_addr; -uint8_t tq_avg; +u8 sum_orig, sum_neigh; +u8 *neigh_addr; +u8 tq_avg;batadv_dbg (BATADV_DBG_BATMAN , bat_priv,"update_originator(): Searching and updating originator entry of received packet\n" );
@@ -1164,8 +1162,8 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,struct batadv_priv *bat_priv =netdev_priv (if_incoming->soft_iface);struct batadv_neigh_node *neigh_node =NULL , *tmp_neigh_node;struct batadv_neigh_ifinfo *neigh_ifinfo; -uint8_t total_count; -uint8_t orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own; +u8 total_count; +u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own;unsigned int neigh_rq_inv_cube, neigh_rq_max_cube;int tq_asym_penalty, inv_asym_penalty, if_num, ret =0 ;unsigned int combined_tq;
@@ -1311,13 +1309,13 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,struct batadv_neigh_node *neigh_node;struct batadv_neigh_ifinfo *neigh_ifinfo;int is_dup; -int32_t seq_diff; +s32 seq_diff;int need_update =0 ;int set_mark;enum batadv_dup_status ret =BATADV_NO_DUP ; -uint32_t seqno =ntohl (batadv_ogm_packet->seqno); -uint8_t *neigh_addr; -uint8_t packet_count; +u32 seqno =ntohl (batadv_ogm_packet->seqno); +u8 *neigh_addr; +u8 packet_count;unsigned long *bitmap; orig_node =batadv_iv_ogm_orig_get (bat_priv, batadv_ogm_packet->orig);
@@ -1418,7 +1416,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,bool sameseq, similar_ttl;struct sk_buff *skb_priv;struct ethhdr *ethhdr; -uint8_t *prev_sender; +u8 *prev_sender;int is_bidirect;/* create a private copy of the skb, as some functions change tq value
@@ -1600,7 +1598,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,struct batadv_orig_node *orig_neigh_node, *orig_node;struct batadv_hard_iface *hard_iface;struct batadv_ogm_packet *ogm_packet; -uint32_t if_incoming_seqno; +u32 if_incoming_seqno;bool has_directlink_flag;struct ethhdr *ethhdr;bool is_my_oldorig = false;
@@ -1673,9 +1671,9 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,if (is_my_orig) {unsigned long *word;int offset; -int32_t bit_pos; -int16_t if_num; -uint8_t *weight; +s32 bit_pos; +s16 if_num; +u8 *weight; orig_neigh_node =batadv_iv_ogm_orig_get (bat_priv, ethhdr->h_source);
@@ -1751,7 +1749,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, {struct batadv_priv *bat_priv =netdev_priv (if_incoming->soft_iface);struct batadv_ogm_packet *ogm_packet; -uint8_t *packet_pos; +u8 *packet_pos;int ogm_offset;bool ret;
@@ -1835,7 +1833,7 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv,unsigned long last_seen_jiffies;struct hlist_head *head;int batman_count =0 ; -uint32_t i; +u32 i; seq_printf(seq, " %-15s %s (%s/%i) %17s [%10s]: %20s ...\n", "Originator", "last-seen", "#", BATADV_TQ_MAX_VALUE,
@@ -1903,7 +1901,7 @@ static int batadv_iv_ogm_neigh_cmp(struct batadv_neigh_node *neigh1, struct batadv_hard_iface *if_outgoing2) {struct batadv_neigh_ifinfo *neigh1_ifinfo, *neigh2_ifinfo; -uint8_t tq1, tq2; +u8 tq1, tq2;int diff; neigh1_ifinfo =batadv_neigh_ifinfo_get (neigh1, if_outgoing1);
@@ -1945,7 +1943,7 @@ batadv_iv_ogm_neigh_is_eob(struct batadv_neigh_node *neigh1, struct batadv_hard_iface *if_outgoing2) {struct batadv_neigh_ifinfo *neigh1_ifinfo, *neigh2_ifinfo; -uint8_t tq1, tq2; +u8 tq1, tq2;bool ret; neigh1_ifinfo =batadv_neigh_ifinfo_get (neigh1, if_outgoing1);
net/batman-adv/bitarray.c +3 -3
@@ -21,7 +21,7 @@#include <linux/bitmap.h> /* shift the packet array by n places. */ -static void batadv_bitmap_shift_left (unsigned long *seq_bits,int32_t n) +static void batadv_bitmap_shift_left (unsigned long *seq_bits,s32 n) {if (n <=0 || n >=BATADV_TQ_LOCAL_WINDOW_SIZE )return ;
@@ -35,8 +35,8 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n)* 1 if the window was moved (either new or very old) * 0 if the window was not moved/shifted. */ -int batadv_bit_get_packet (void *priv,unsigned long *seq_bits, -int32_t seq_num_diff,int set_mark) +int batadv_bit_get_packet (void *priv,unsigned long *seq_bits,s32 seq_num_diff, +int set_mark) {struct batadv_priv *bat_priv = priv;
net/batman-adv/bitarray.h +5 -5
@@ -28,9 +28,9 @@* and curr_seqno is within range of last_seqno. Otherwise returns 0. */ static inline int batadv_test_bit (const unsigned long *seq_bits, -uint32_t last_seqno,uint32_t curr_seqno) +u32 last_seqno,u32 curr_seqno) { -int32_t diff; +s32 diff; diff = last_seqno - curr_seqno;if (diff <0 || diff >=BATADV_TQ_LOCAL_WINDOW_SIZE )
@@ -39,7 +39,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits, }/* turn corresponding bit on, so we can remember that we got the packet */ -static inline void batadv_set_bit (unsigned long *seq_bits,int32_t n) +static inline void batadv_set_bit (unsigned long *seq_bits,s32 n) {/* if too old, just drop it */ if (n <0 || n >=BATADV_TQ_LOCAL_WINDOW_SIZE )
@@ -51,7 +51,7 @@ static inline void batadv_set_bit(unsigned long *seq_bits, int32_t n)/* receive and process one packet, returns 1 if received seq_num is considered * new, 0 if old */ -int batadv_bit_get_packet (void *priv,unsigned long *seq_bits, -int32_t seq_num_diff,int set_mark); +int batadv_bit_get_packet (void *priv,unsigned long *seq_bits,s32 seq_num_diff, +int set_mark);#endif /* _NET_BATMAN_ADV_BITARRAY_H_ */
net/batman-adv/bridge_loop_avoidance.c +35 -37
226 lines not on this page · raw message
net/batman-adv/bridge_loop_avoidance.h +2 -3
@@ -38,7 +38,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb,int batadv_bla_claim_table_seq_print_text (struct seq_file *seq,void *offset);int batadv_bla_backbone_table_seq_print_text (struct seq_file *seq,void *offset); -bool batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv,uint8_t *orig, +bool batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv,u8 *orig,unsigned short vid);int batadv_bla_check_bcast_duplist (struct batadv_priv *bat_priv,struct sk_buff *skb);
@@ -84,8 +84,7 @@ static inline int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, }static inline bool batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv, -uint8_t *orig, -unsigned short vid) +u8 *orig,unsigned short vid) {return false; }
net/batman-adv/distributed-arp-table.c +29 -30
171 lines not on this page · raw message
net/batman-adv/distributed-arp-table.h +4 -4
@@ -54,7 +54,7 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,static inline void batadv_dat_init_orig_node_addr (struct batadv_orig_node *orig_node) { -uint32_t addr; +u32 addr; addr =batadv_choose_orig (orig_node->orig,BATADV_DAT_ADDR_MAX ); orig_node->dat_addr = (batadv_dat_addr_t )addr;
@@ -69,7 +69,7 @@ static inline void batadv_dat_init_own_addr(struct batadv_priv *bat_priv, struct batadv_hard_iface *primary_if) { - uint32_t addr; + u32 addr; addr =batadv_choose_orig (primary_if->net_dev->dev_addr,BATADV_DAT_ADDR_MAX );
@@ -89,7 +89,7 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset);* Updates the ethtool statistics for the received packet if it is a DAT subtype */ static inline void batadv_dat_inc_counter (struct batadv_priv *bat_priv, -uint8_t subtype) +u8 subtype) {switch (subtype) {case BATADV_P_DAT_DHT_GET :
@@ -169,7 +169,7 @@ static inline void batadv_dat_free(struct batadv_priv *bat_priv) }static inline void batadv_dat_inc_counter (struct batadv_priv *bat_priv, -uint8_t subtype) +u8 subtype) { }
net/batman-adv/fragmentation.c +5 -5
@@ -66,7 +66,7 @@ void batadv_frag_purge_orig(struct batadv_orig_node *orig_node, bool (*check_cb)(struct batadv_frag_table_entry *)) {struct batadv_frag_table_entry *chain; -uint8_t i; +u8 i;for (i =0 ; i <BATADV_FRAG_BUFFER_COUNT ; i++) { chain = &orig_node->fragments[i];
@@ -110,7 +110,7 @@ static int batadv_frag_size_limit(void)* without searching for the right position. */ static bool batadv_frag_init_chain (struct batadv_frag_table_entry *chain, -uint16_t seqno) +u16 seqno) {if (chain->seqno == seqno)return false;
@@ -145,8 +145,8 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node,struct batadv_frag_list_entry *frag_entry_new =NULL , *frag_entry_curr;struct batadv_frag_list_entry *frag_entry_last =NULL ;struct batadv_frag_packet *frag_packet; -uint8_t bucket; -uint16_t seqno, hdr_size =sizeof (struct batadv_frag_packet ); +u8 bucket; +u16 seqno, hdr_size =sizeof (struct batadv_frag_packet );bool ret = false;/* Linearize packet to avoid linearizing 16 packets in a row when doing
@@ -351,7 +351,7 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,struct batadv_orig_node *orig_node_dst =NULL ;struct batadv_neigh_node *neigh_node =NULL ;struct batadv_frag_packet *packet; -uint16_t total_size; +u16 total_size;bool ret = false; packet = (struct batadv_frag_packet *)skb->data;
net/batman-adv/gateway_client.c +7 -7
@@ -153,9 +153,9 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv)struct batadv_neigh_node *router;struct batadv_neigh_ifinfo *router_ifinfo;struct batadv_gw_node *gw_node, *curr_gw =NULL ; -uint64_t max_gw_factor =0 , tmp_gw_factor =0 ; -uint8_t max_tq =0 ; -uint8_t tq_avg; +u64 max_gw_factor =0 , tmp_gw_factor =0 ; +u8 max_tq =0 ; +u8 tq_avg;struct batadv_orig_node *orig_node;rcu_read_lock ();
@@ -348,7 +348,7 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv,struct batadv_neigh_ifinfo *router_gw_tq =NULL ;struct batadv_orig_node *curr_gw_orig;struct batadv_neigh_node *router_gw =NULL , *router_orig =NULL ; -uint8_t gw_tq_avg, orig_tq_avg; +u8 gw_tq_avg, orig_tq_avg; curr_gw_orig =batadv_gw_get_selected_orig (bat_priv);if (!curr_gw_orig)
@@ -688,7 +688,7 @@ out:*/ enum batadv_dhcp_recipient batadv_gw_dhcp_recipient_get (struct sk_buff *skb,unsigned int *header_len, -uint8_t *chaddr) +u8 *chaddr) {enum batadv_dhcp_recipient ret =BATADV_DHCP_NO ;struct ethhdr *ethhdr;
@@ -698,7 +698,7 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,struct vlan_ethhdr *vhdr;int chaddr_offset;__be16 proto; -uint8_t *p; +u8 *p;/* check for ethernet header */ if (!pskb_may_pull (skb, *header_len +ETH_HLEN ))
@@ -814,7 +814,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,struct batadv_neigh_ifinfo *curr_ifinfo, *old_ifinfo;struct ethhdr *ethhdr = (struct ethhdr *)skb->data;bool out_of_range = false; -uint8_t curr_tq_avg; +u8 curr_tq_avg;unsigned short vid; vid =batadv_get_vid (skb,0 );
net/batman-adv/gateway_client.h +1 -1
@@ -43,6 +43,6 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset);bool batadv_gw_out_of_range (struct batadv_priv *bat_priv,struct sk_buff *skb);enum batadv_dhcp_recipient batadv_gw_dhcp_recipient_get (struct sk_buff *skb,unsigned int *header_len, -uint8_t *chaddr); +u8 *chaddr);#endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */
net/batman-adv/gateway_common.c +5 -6
@@ -39,7 +39,7 @@* Returns false on parse error and true otherwise. */ static bool batadv_parse_gw_bandwidth (struct net_device *net_dev,char *buff, -uint32_t *down,uint32_t *up) +u32 *down,u32 *up) {enum batadv_bandwidth_units bw_unit_type =BATADV_BW_UNIT_KBIT ;char *slash_ptr, *tmp_ptr;
@@ -124,7 +124,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff,void batadv_gw_tvlv_container_update (struct batadv_priv *bat_priv) {struct batadv_tvlv_gateway_data gw; -uint32_t down, up; +u32 down, up;char gw_mode; gw_mode =atomic_read (&bat_priv->gw_mode);
@@ -149,7 +149,7 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count) {struct batadv_priv *bat_priv =netdev_priv (net_dev); -uint32_t down_curr, up_curr, down_new =0 , up_new =0 ; +u32 down_curr, up_curr, down_new =0 , up_new =0 ;bool ret; down_curr = (unsigned int )atomic_read (&bat_priv->gw.bandwidth_down);
@@ -195,9 +195,8 @@ end:*/ static void batadv_gw_tvlv_ogm_handler_v1 (struct batadv_priv *bat_priv,struct batadv_orig_node *orig, -uint8_t flags, -void *tvlv_value, -uint16_t tvlv_value_len) +u8 flags, +void *tvlv_value,u16 tvlv_value_len) {struct batadv_tvlv_gateway_data gateway, *gateway_ptr;
net/batman-adv/hash.c +3 -3
@@ -25,7 +25,7 @@/* clears the hash */ static void batadv_hash_init (struct batadv_hashtable *hash) { -uint32_t i; +u32 i;for (i =0 ; i < hash->size; i++) {INIT_HLIST_HEAD (&hash->table[i]);
@@ -42,7 +42,7 @@ void batadv_hash_destroy(struct batadv_hashtable *hash) }/* allocates and clears the hash */ -struct batadv_hashtable *batadv_hash_new (uint32_t size) +struct batadv_hashtable *batadv_hash_new (u32 size) {struct batadv_hashtable *hash;
@@ -73,7 +73,7 @@ free_hash:void batadv_hash_set_lock_class (struct batadv_hashtable *hash,struct lock_class_key *key) { -uint32_t i; +u32 i;for (i =0 ; i < hash->size; i++)lockdep_set_class (&hash->list_locks[i], key);
net/batman-adv/hash.h +6 -6
@@ -39,17 +39,17 @@ typedef int (*batadv_hashdata_compare_cb)(const struct hlist_node *,* based on the key in the data of the first * argument and the size the second */ -typedef uint32_t (*batadv_hashdata_choose_cb )(const void *,uint32_t ); +typedef u32 (*batadv_hashdata_choose_cb )(const void *,u32 );typedef void (*batadv_hashdata_free_cb )(struct hlist_node *,void *);struct batadv_hashtable {struct hlist_head *table;/* the hashtable itself with the buckets */ spinlock_t *list_locks;/* spinlock for each hash list entry */ -uint32_t size;/* size of hashtable */ +u32 size;/* size of hashtable */ };/* allocates and clears the hash */ -struct batadv_hashtable *batadv_hash_new (uint32_t size); +struct batadv_hashtable *batadv_hash_new (u32 size);/* set class key for all locks */ void batadv_hash_set_lock_class(struct batadv_hashtable *hash,
@@ -69,7 +69,7 @@ static inline void batadv_hash_delete(struct batadv_hashtable *hash,struct hlist_head *head;struct hlist_node *node, *node_tmp;spinlock_t *list_lock;/* spinlock to protect write access */ -uint32_t i; +u32 i;for (i =0 ; i < hash->size; i++) { head = &hash->table[i];
@@ -105,7 +105,7 @@ static inline int batadv_hash_add(struct batadv_hashtable *hash,const void *data, struct hlist_node *data_node) { - uint32_t index; + u32 index;int ret =-1 ;struct hlist_head *head;struct hlist_node *node;
@@ -149,7 +149,7 @@ static inline void *batadv_hash_remove(struct batadv_hashtable *hash,batadv_hashdata_choose_cb choose, void *data) { - uint32_t index; + u32 index;struct hlist_node *node;struct hlist_head *head;void *data_save =NULL ;
net/batman-adv/icmp_socket.c +1 -1
@@ -183,7 +183,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff,struct batadv_orig_node *orig_node =NULL ;struct batadv_neigh_node *neigh_node =NULL ;size_t packet_len =sizeof (struct batadv_icmp_packet ); -uint8_t *addr; +u8 *addr;if (len <sizeof (struct batadv_icmp_header )) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
net/batman-adv/main.c +33 -36
188 lines not on this page · raw message
net/batman-adv/main.h +23 -25
96 lines not on this page · raw message
net/batman-adv/multicast.c +8 -8
@@ -89,7 +89,7 @@ static int batadv_mcast_mla_softif_get(struct net_device *dev,* Returns true if the given address is already in the given list. * Otherwise returns false. */ -static bool batadv_mcast_mla_is_duplicate (uint8_t *mcast_addr, +static bool batadv_mcast_mla_is_duplicate (u8 *mcast_addr,struct hlist_head *mcast_list) {struct batadv_hw_addr *mcast_entry;
@@ -595,7 +595,7 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,*/ static void batadv_mcast_want_unsnoop_update (struct batadv_priv *bat_priv,struct batadv_orig_node *orig, -uint8_t mcast_flags) +u8 mcast_flags) {struct hlist_node *node = &orig->mcast_want_all_unsnoopables_node;struct hlist_head *head = &bat_priv->mcast.want_all_unsnoopables_list;
@@ -638,7 +638,7 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,*/ static void batadv_mcast_want_ipv4_update (struct batadv_priv *bat_priv,struct batadv_orig_node *orig, -uint8_t mcast_flags) +u8 mcast_flags) {struct hlist_node *node = &orig->mcast_want_all_ipv4_node;struct hlist_head *head = &bat_priv->mcast.want_all_ipv4_list;
@@ -681,7 +681,7 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,*/ static void batadv_mcast_want_ipv6_update (struct batadv_priv *bat_priv,struct batadv_orig_node *orig, -uint8_t mcast_flags) +u8 mcast_flags) {struct hlist_node *node = &orig->mcast_want_all_ipv6_node;struct hlist_head *head = &bat_priv->mcast.want_all_ipv6_list;
@@ -721,17 +721,17 @@ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,*/ static void batadv_mcast_tvlv_ogm_handler_v1 (struct batadv_priv *bat_priv,struct batadv_orig_node *orig, -uint8_t flags, +u8 flags,void *tvlv_value, -uint16_t tvlv_value_len) +u16 tvlv_value_len) {bool orig_mcast_enabled = !(flags &BATADV_TVLV_HANDLER_OGM_CIFNOTFND ); -uint8_t mcast_flags =BATADV_NO_FLAGS ; +u8 mcast_flags =BATADV_NO_FLAGS ;bool orig_initialized;if (orig_mcast_enabled && tvlv_value && (tvlv_value_len >=sizeof (mcast_flags))) - mcast_flags = *(uint8_t *)tvlv_value; + mcast_flags = *(u8 *)tvlv_value;spin_lock_bh (&orig->mcast_handler_lock); orig_initialized = test_bit(BATADV_ORIG_CAPA_HAS_MCAST,
net/batman-adv/network-coding.c +21 -23
137 lines not on this page · raw message
net/batman-adv/originator.c +7 -8
@@ -452,8 +452,7 @@ out:*/ struct batadv_neigh_node *batadv_neigh_node_new (struct batadv_hard_iface *hard_iface, -const uint8_t *neigh_addr, -struct batadv_orig_node *orig_node) +const u8 *neigh_addr,struct batadv_orig_node *orig_node) {struct batadv_neigh_node *neigh_node;
@@ -489,7 +488,7 @@ out:struct batadv_neigh_node *batadv_neigh_node_get (const struct batadv_orig_node *orig_node,const struct batadv_hard_iface *hard_iface, -const uint8_t *addr) +const u8 *addr) {struct batadv_neigh_node *tmp_neigh_node, *res =NULL ;
@@ -624,7 +623,7 @@ void batadv_originator_free(struct batadv_priv *bat_priv)struct hlist_head *head;spinlock_t *list_lock;/* spinlock to protect write access */ struct batadv_orig_node *orig_node; -uint32_t i; +u32 i;if (!hash)return ;
@@ -659,7 +658,7 @@ void batadv_originator_free(struct batadv_priv *bat_priv)* Returns the newly created object or NULL on failure. */ struct batadv_orig_node *batadv_orig_node_new (struct batadv_priv *bat_priv, -const uint8_t *addr) +const u8 *addr) {struct batadv_orig_node *orig_node;struct batadv_orig_node_vlan *vlan;
@@ -981,7 +980,7 @@ static void _batadv_purge_orig(struct batadv_priv *bat_priv)struct hlist_head *head;spinlock_t *list_lock;/* spinlock to protect write access */ struct batadv_orig_node *orig_node; -uint32_t i; +u32 i;if (!hash)return ;
@@ -1115,7 +1114,7 @@ int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface,struct batadv_hashtable *hash = bat_priv->orig_hash;struct hlist_head *head;struct batadv_orig_node *orig_node; -uint32_t i; +u32 i;int ret;/* resize all orig nodes because orig_node->bcast_own(_sum) depend on
@@ -1152,7 +1151,7 @@ int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface,struct batadv_hard_iface *hard_iface_tmp;struct batadv_orig_node *orig_node;struct batadv_algo_ops *bao = bat_priv->bat_algo_ops; -uint32_t i; +u32 i;int ret;/* resize all orig nodes because orig_node->bcast_own(_sum) depend on
net/batman-adv/originator.h +5 -6
@@ -40,15 +40,14 @@ void batadv_purge_orig_ref(struct batadv_priv *bat_priv);void batadv_orig_node_free_ref (struct batadv_orig_node *orig_node);void batadv_orig_node_free_ref_now (struct batadv_orig_node *orig_node);struct batadv_orig_node *batadv_orig_node_new (struct batadv_priv *bat_priv, -const uint8_t *addr); +const u8 *addr);struct batadv_neigh_node *batadv_neigh_node_get (const struct batadv_orig_node *orig_node,const struct batadv_hard_iface *hard_iface, -const uint8_t *addr); +const u8 *addr);struct batadv_neigh_node *batadv_neigh_node_new (struct batadv_hard_iface *hard_iface, -const uint8_t *neigh_addr, -struct batadv_orig_node *orig_node); +const u8 *neigh_addr,struct batadv_orig_node *orig_node);void batadv_neigh_node_free_ref (struct batadv_neigh_node *neigh_node);struct batadv_neigh_node * batadv_orig_router_get(struct batadv_orig_node *orig_node,
@@ -86,9 +85,9 @@ 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 */ -static inline uint32_t batadv_choose_orig (const void *data,uint32_t size) +static inline u32 batadv_choose_orig (const void *data,u32 size) { -uint32_t hash =0 ; +u32 hash =0 ; hash =jhash (data,ETH_ALEN , hash);return hash % size;
net/batman-adv/packet.h +102 -102
311 lines not on this page · raw message
net/batman-adv/routing.c +12 -12
@@ -145,7 +145,7 @@ out:* 0 if the packet is to be accepted * 1 if the packet is to be ignored. */ -int batadv_window_protected (struct batadv_priv *bat_priv,int32_t seq_num_diff, +int batadv_window_protected (struct batadv_priv *bat_priv,s32 seq_num_diff,unsigned long *last_reset) { if (seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE ||
@@ -653,19 +653,19 @@ out:static bool batadv_reroute_unicast_packet (struct batadv_priv *bat_priv,struct batadv_unicast_packet *unicast_packet, -uint8_t *dst_addr,unsigned short vid) +u8 *dst_addr,unsigned short vid) {struct batadv_orig_node *orig_node =NULL ;struct batadv_hard_iface *primary_if =NULL ;bool ret = false; -uint8_t *orig_addr, orig_ttvn; +u8 *orig_addr, orig_ttvn;if (batadv_is_my_client (bat_priv, dst_addr, vid)) { primary_if =batadv_primary_if_get_selected (bat_priv);if (!primary_if) goto out; orig_addr = primary_if->net_dev->dev_addr; - orig_ttvn = (uint8_t )atomic_read (&bat_priv->tt.vn); + orig_ttvn = (u8 )atomic_read (&bat_priv->tt.vn); }else { orig_node =batadv_transtable_search (bat_priv,NULL , dst_addr, vid);
@@ -676,7 +676,7 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, goto out; orig_addr = orig_node->orig; - orig_ttvn = (uint8_t )atomic_read (&orig_node->last_ttvn); + orig_ttvn = (u8 )atomic_read (&orig_node->last_ttvn); }/* update the packet header */
@@ -698,7 +698,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,struct batadv_unicast_packet *unicast_packet;struct batadv_hard_iface *primary_if;struct batadv_orig_node *orig_node; -uint8_t curr_ttvn, old_ttvn; +u8 curr_ttvn, old_ttvn;struct ethhdr *ethhdr;unsigned short vid;int is_old_ttvn;
@@ -740,7 +740,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,* value is used later to check if the node which sent (or re-routed * last time) the packet had an updated information or not */ - curr_ttvn = (uint8_t )atomic_read (&bat_priv->tt.vn); + curr_ttvn = (u8 )atomic_read (&bat_priv->tt.vn);if (!batadv_is_my_mac (bat_priv, unicast_packet->dest)) { orig_node =batadv_orig_hash_find (bat_priv, unicast_packet->dest);
@@ -751,7 +751,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,if (!orig_node)return 0 ; - curr_ttvn = (uint8_t )atomic_read (&orig_node->last_ttvn); + curr_ttvn = (u8 )atomic_read (&orig_node->last_ttvn);batadv_orig_node_free_ref (orig_node); }
@@ -833,7 +833,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,struct batadv_priv *bat_priv =netdev_priv (recv_if->soft_iface);struct batadv_unicast_packet *unicast_packet;struct batadv_unicast_4addr_packet *unicast_4addr_packet; -uint8_t *orig_addr; +u8 *orig_addr;struct batadv_orig_node *orig_node =NULL ;int check, hdr_size =sizeof (*unicast_packet);bool is4addr;
@@ -904,7 +904,7 @@ int batadv_recv_unicast_tvlv(struct sk_buff *skb,struct batadv_priv *bat_priv =netdev_priv (recv_if->soft_iface);struct batadv_unicast_tvlv_packet *unicast_tvlv_packet;unsigned char *tvlv_buff; -uint16_t tvlv_buff_len; +u16 tvlv_buff_len;int hdr_size =sizeof (*unicast_tvlv_packet);int ret =NET_RX_DROP ;
@@ -1007,8 +1007,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,struct ethhdr *ethhdr;int hdr_size =sizeof (*bcast_packet);int ret =NET_RX_DROP ; -int32_t seq_diff; -uint32_t seqno; +s32 seq_diff; +u32 seqno;/* drop packet if it has not necessary minimum size */ if (unlikely (!pskb_may_pull (skb, hdr_size)))
net/batman-adv/routing.h +1 -1
@@ -55,7 +55,7 @@ struct batadv_neigh_node * batadv_find_router(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, struct batadv_hard_iface *recv_if); -int batadv_window_protected (struct batadv_priv *bat_priv,int32_t seq_num_diff, +int batadv_window_protected (struct batadv_priv *bat_priv,s32 seq_num_diff,unsigned long *last_reset);#endif /* _NET_BATMAN_ADV_ROUTING_H_ */
net/batman-adv/send.c +4 -4
@@ -54,7 +54,7 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work);*/ int batadv_send_skb_packet (struct sk_buff *skb,struct batadv_hard_iface *hard_iface, -const uint8_t *dst_addr) +const u8 *dst_addr) {struct batadv_priv *bat_priv =netdev_priv (hard_iface->soft_iface);struct ethhdr *ethhdr;
@@ -172,7 +172,7 @@ batadv_send_skb_push_fill_unicast(struct sk_buff *skb, int hdr_size, struct batadv_orig_node *orig_node) {struct batadv_unicast_packet *unicast_packet; -uint8_t ttvn = (uint8_t )atomic_read (&orig_node->last_ttvn); +u8 ttvn = (u8 )atomic_read (&orig_node->last_ttvn);if (batadv_skb_head_push (skb, hdr_size) <0 )return false;
@@ -343,12 +343,12 @@ out:*/ int batadv_send_skb_via_tt_generic (struct batadv_priv *bat_priv,struct sk_buff *skb,int packet_type, -int packet_subtype,uint8_t *dst_hint, +int packet_subtype,u8 *dst_hint,unsigned short vid) {struct ethhdr *ethhdr = (struct ethhdr *)skb->data;struct batadv_orig_node *orig_node; -uint8_t *src, *dst; +u8 *src, *dst; src = ethhdr->h_source; dst = ethhdr->h_dest;
net/batman-adv/send.h +4 -4
@@ -33,7 +33,7 @@ struct work_struct;int batadv_send_skb_packet (struct sk_buff *skb,struct batadv_hard_iface *hard_iface, -const uint8_t *dst_addr); +const u8 *dst_addr);int batadv_send_skb_to_orig (struct sk_buff *skb,struct batadv_orig_node *orig_node,struct batadv_hard_iface *recv_if);
@@ -56,7 +56,7 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv, unsigned short vid);int batadv_send_skb_via_tt_generic (struct batadv_priv *bat_priv,struct sk_buff *skb,int packet_type, -int packet_subtype,uint8_t *dst_hint, +int packet_subtype,u8 *dst_hint,unsigned short vid);int batadv_send_skb_via_gw (struct batadv_priv *bat_priv,struct sk_buff *skb,unsigned short vid);
@@ -75,7 +75,7 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,* Returns NET_XMIT_DROP in case of error or NET_XMIT_SUCCESS otherwise. */ static inline int batadv_send_skb_via_tt (struct batadv_priv *bat_priv, -struct sk_buff *skb,uint8_t *dst_hint, +struct sk_buff *skb,u8 *dst_hint,unsigned short vid) { return batadv_send_skb_via_tt_generic(bat_priv, skb, BATADV_UNICAST, 0,
@@ -100,7 +100,7 @@ static inline int batadv_send_skb_via_tt(struct batadv_priv *bat_priv,static inline int batadv_send_skb_via_tt_4addr (struct batadv_priv *bat_priv,struct sk_buff *skb,int packet_subtype, -uint8_t *dst_hint, +u8 *dst_hint,unsigned short vid) { return batadv_send_skb_via_tt_generic(bat_priv, skb,
net/batman-adv/soft-interface.c +12 -14
@@ -131,7 +131,7 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)struct batadv_priv *bat_priv =netdev_priv (dev);struct batadv_softif_vlan *vlan;struct sockaddr *addr = p; -uint8_t old_addr[ETH_ALEN ]; +u8 old_addr[ETH_ALEN ];if (!is_valid_ether_addr (addr->sa_data))return -EADDRNOTAVAIL ;
@@ -186,19 +186,19 @@ static int batadv_interface_tx(struct sk_buff *skb,struct batadv_hard_iface *primary_if =NULL ;struct batadv_bcast_packet *bcast_packet;__be16 ethertype =htons (ETH_P_BATMAN ); -static const uint8_t stp_addr[ETH_ALEN ] = {0x01 ,0x80 ,0xC2 ,0x00 , -0x00 ,0x00 }; -static const uint8_t ectp_addr[ETH_ALEN ] = {0xCF ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 }; +static const u8 stp_addr[ETH_ALEN ] = {0x01 ,0x80 ,0xC2 ,0x00 , +0x00 ,0x00 }; +static const u8 ectp_addr[ETH_ALEN ] = {0xCF ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 };enum batadv_dhcp_recipient dhcp_rcp =BATADV_DHCP_NO ; -uint8_t *dst_hint =NULL , chaddr[ETH_ALEN ]; +u8 *dst_hint =NULL , chaddr[ETH_ALEN ];struct vlan_ethhdr *vhdr;unsigned int header_len =0 ;int data_len = skb->len, ret;unsigned long brd_delay =1 ;bool do_bcast = false, client_added;unsigned short vid; -uint32_t seqno; +u32 seqno;int gw_mode;enum batadv_forw_mode forw_mode;struct batadv_orig_node *mcast_single_orig =NULL ;
@@ -750,9 +750,9 @@ static void batadv_softif_destroy_finish(struct work_struct *work)static int batadv_softif_init_late (struct net_device *dev) {struct batadv_priv *bat_priv; -uint32_t random_seqno; +u32 random_seqno;int ret; -size_t cnt_len =sizeof (uint64_t ) *BATADV_CNT_NUM ; +size_t cnt_len =sizeof (u64) *BATADV_CNT_NUM ;batadv_set_lockdep_class (dev);
@@ -763,7 +763,7 @@ static int batadv_softif_init_late(struct net_device *dev)/* batadv_interface_stats() needs to be available as soon as * register_netdevice() has been called */ - bat_priv->bat_counters =__alloc_percpu (cnt_len, __alignof__(uint64_t )); + bat_priv->bat_counters =__alloc_percpu (cnt_len, __alignof__(u64 ));if (!bat_priv->bat_counters)return -ENOMEM ;
@@ -1117,8 +1117,7 @@ static const struct {#endif }; -static void batadv_get_strings (struct net_device *dev,uint32_t stringset, -uint8_t *data) +static void batadv_get_strings (struct net_device *dev,u32 stringset,u8 *data) {if (stringset ==ETH_SS_STATS ) memcpy(data, batadv_counters_strings,
@@ -1126,8 +1125,7 @@ static void batadv_get_strings(struct net_device *dev, uint32_t stringset, }static void batadv_get_ethtool_stats (struct net_device *dev, -struct ethtool_stats *stats, -uint64_t *data) +struct ethtool_stats *stats,u64 *data) {struct batadv_priv *bat_priv =netdev_priv (dev);int i;
net/batman-adv/sysfs.c +2 -2
@@ -457,7 +457,7 @@ static ssize_t batadv_show_gw_bwidth(struct kobject *kobj, struct attribute *attr, char *buff) { struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); -uint32_t down, up; +u32 down, up; down =atomic_read (&bat_priv->gw.bandwidth_down); up =atomic_read (&bat_priv->gw.bandwidth_up);
@@ -512,7 +512,7 @@ static ssize_t batadv_store_isolation_mark(struct kobject *kobj, {struct net_device *net_dev =batadv_kobj_to_netdev (kobj);struct batadv_priv *bat_priv =netdev_priv (net_dev); -uint32_t mark, mask; +u32 mark, mask;char *mask_ptr;/* parse the mask if it has been specified, otherwise assume the mask is
net/batman-adv/translation-table.c +111 -113
676 lines not on this page · raw message
net/batman-adv/translation-table.h +14 -15
@@ -28,38 +28,37 @@ struct net_device;struct seq_file ;int batadv_tt_init (struct batadv_priv *bat_priv); -bool batadv_tt_local_add (struct net_device *soft_iface,const uint8_t *addr, -unsigned short vid,int ifindex,uint32_t mark); -uint16_t batadv_tt_local_remove (struct batadv_priv *bat_priv, -const uint8_t *addr,unsigned short vid, -const char *message,bool roaming); +bool batadv_tt_local_add (struct net_device *soft_iface,const u8 *addr, +unsigned short vid,int ifindex,u32 mark); +u16 batadv_tt_local_remove (struct batadv_priv *bat_priv, +const u8 *addr,unsigned short vid, +const char *message,bool roaming);int batadv_tt_local_seq_print_text (struct seq_file *seq,void *offset);int batadv_tt_global_seq_print_text (struct seq_file *seq,void *offset);void batadv_tt_global_del_orig (struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node, -int32_t match_vid,const char *message); +s32 match_vid,const char *message);int batadv_tt_global_hash_count (struct batadv_priv *bat_priv, -const uint8_t *addr,unsigned short vid); +const u8 *addr,unsigned short vid);struct batadv_orig_node *batadv_transtable_search (struct batadv_priv *bat_priv, -const uint8_t *src, -const uint8_t *addr, +const u8 *src,const u8 *addr,unsigned short vid);void batadv_tt_free (struct batadv_priv *bat_priv); -bool batadv_is_my_client (struct batadv_priv *bat_priv,const uint8_t *addr, +bool batadv_is_my_client (struct batadv_priv *bat_priv,const u8 *addr,unsigned short vid); -bool batadv_is_ap_isolated (struct batadv_priv *bat_priv,uint8_t *src, -uint8_t *dst,unsigned short vid); +bool batadv_is_ap_isolated (struct batadv_priv *bat_priv,u8 *src,u8 *dst, +unsigned short vid);void batadv_tt_local_commit_changes (struct batadv_priv *bat_priv);bool batadv_tt_global_client_is_roaming (struct batadv_priv *bat_priv, -uint8_t *addr,unsigned short vid); +u8 *addr,unsigned short vid);bool batadv_tt_local_client_is_roaming (struct batadv_priv *bat_priv, -uint8_t *addr,unsigned short vid); +u8 *addr,unsigned short vid);void batadv_tt_local_resize_to_mtu (struct net_device *soft_iface);bool batadv_tt_add_temporary_global_entry (struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node,const unsigned char *addr,unsigned short vid);bool batadv_tt_global_is_isolated (struct batadv_priv *bat_priv, -const uint8_t *addr,unsigned short vid); +const u8 *addr,unsigned short vid);#endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */
net/batman-adv/types.h +52 -53
204 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.5.0
Part of the diff is not shown here. View the raw message.
PATCH 2/15 batman-adv: Fix kerneldoc over 80 column lines
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
Kerneldoc required single line documentation in the past (before 2009). Therefore, the 80 columns limit per line check of checkpatch was disabled for kerneldoc. But kerneldoc is not excluded anymore from it and checkpatch now enabled the check again.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/icmp_socket.c | 4 ++-- net/batman-adv/network-coding.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
net/batman-adv/icmp_socket.c +2 -2
@@ -337,8 +337,8 @@ err: }/** -* batadv_socket_receive_packet - schedule an icmp packet to be sent to userspace -* on an icmp socket. +* batadv_socket_receive_packet - schedule an icmp packet to be sent to +* userspace on an icmp socket. * @socket_client: the socket this packet belongs to * @icmph: pointer to the header of the icmp packet * @icmp_len: total length of the icmp packet
net/batman-adv/network-coding.c +2 -2
@@ -872,8 +872,8 @@ free: }/** -* batadv_nc_update_nc_node - updates stored incoming and outgoing nc node structs -* (best called on incoming OGMs) +* batadv_nc_update_nc_node - updates stored incoming and outgoing nc node +* structs (best called on incoming OGMs) * @bat_priv: the bat priv with all the soft interface information * @orig_node: orig node originating the ogm packet * @orig_neigh_node: neighboring orig node from which we received the ogm packet
Signature · 1 line
2.5.0
PATCH 3/15 batman-adv: Remove multiple assignment per line
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
The Linux CodingStyle disallows multiple assignments in a single line. (see chapter 1)
Reported-by Markus Pargmann <[email protected]>
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/bat_iv_ogm.c | 6 ++++-- net/batman-adv/bridge_loop_avoidance.c | 6 ++++-- net/batman-adv/distributed-arp-table.c | 3 ++- net/batman-adv/gateway_client.c | 15 ++++++++++----- net/batman-adv/gateway_common.c | 5 ++++- net/batman-adv/network-coding.c | 3 ++- net/batman-adv/translation-table.c | 18 +++++++++++++----- 7 files changed, 39 insertions(+), 17 deletions(-)
net/batman-adv/bat_iv_ogm.c +4 -2
@@ -1004,7 +1004,8 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, {struct batadv_neigh_ifinfo *neigh_ifinfo =NULL ;struct batadv_neigh_ifinfo *router_ifinfo =NULL ; -struct batadv_neigh_node *neigh_node =NULL , *tmp_neigh_node =NULL ; +struct batadv_neigh_node *neigh_node =NULL ; +struct batadv_neigh_node *tmp_neigh_node =NULL ;struct batadv_neigh_node *router =NULL ;struct batadv_orig_node *orig_node_tmp;int if_num;
@@ -1404,7 +1405,8 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, struct batadv_hard_iface *if_outgoing) {struct batadv_priv *bat_priv =netdev_priv (if_incoming->soft_iface); -struct batadv_neigh_node *router =NULL , *router_router =NULL ; +struct batadv_neigh_node *router =NULL ; +struct batadv_neigh_node *router_router =NULL ;struct batadv_orig_node *orig_neigh_node;struct batadv_orig_ifinfo *orig_ifinfo;struct batadv_neigh_node *orig_neigh_router =NULL ;
net/batman-adv/bridge_loop_avoidance.c +4 -2
@@ -88,7 +88,8 @@ static int batadv_compare_backbone_gw(const struct hlist_node *node, { const void *data1 = container_of(node, struct batadv_bla_backbone_gw, hash_entry); -const struct batadv_bla_backbone_gw *gw1 = data1, *gw2 = data2; +const struct batadv_bla_backbone_gw *gw1 = data1; +const struct batadv_bla_backbone_gw *gw2 = data2;if (!batadv_compare_eth (gw1->orig, gw2->orig))return 0 ;
@@ -105,7 +106,8 @@ static int batadv_compare_claim(const struct hlist_node *node, { const void *data1 = container_of(node, struct batadv_bla_claim, hash_entry); -const struct batadv_bla_claim *cl1 = data1, *cl2 = data2; +const struct batadv_bla_claim *cl1 = data1; +const struct batadv_bla_claim *cl2 = data2;if (!batadv_compare_eth (cl1->addr, cl2->addr))return 0 ;
net/batman-adv/distributed-arp-table.c +2 -1
@@ -497,7 +497,8 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, int select, batadv_dat_addr_t ip_key, batadv_dat_addr_t *last_max) { - batadv_dat_addr_t max = 0, tmp_max = 0; + batadv_dat_addr_t max = 0; +batadv_dat_addr_t tmp_max =0 ;struct batadv_orig_node *orig_node, *max_orig_node =NULL ;struct batadv_hashtable *hash = bat_priv->orig_hash;struct hlist_head *head;
net/batman-adv/gateway_client.c +10 -5
@@ -153,7 +153,8 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv)struct batadv_neigh_node *router;struct batadv_neigh_ifinfo *router_ifinfo;struct batadv_gw_node *gw_node, *curr_gw =NULL ; -u64 max_gw_factor =0 , tmp_gw_factor =0 ; +u64 max_gw_factor =0 ; +u64 tmp_gw_factor =0 ;u8 max_tq =0 ;u8 tq_avg;struct batadv_orig_node *orig_node;
@@ -263,7 +264,8 @@ void batadv_gw_check_client_stop(struct batadv_priv *bat_priv)void batadv_gw_election (struct batadv_priv *bat_priv) { -struct batadv_gw_node *curr_gw =NULL , *next_gw =NULL ; +struct batadv_gw_node *curr_gw =NULL ; +struct batadv_gw_node *next_gw =NULL ;struct batadv_neigh_node *router =NULL ;struct batadv_neigh_ifinfo *router_ifinfo =NULL ;char gw_addr[18 ] = {'\0' };
@@ -347,7 +349,8 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv,struct batadv_neigh_ifinfo *router_orig_tq =NULL ;struct batadv_neigh_ifinfo *router_gw_tq =NULL ;struct batadv_orig_node *curr_gw_orig; -struct batadv_neigh_node *router_gw =NULL , *router_orig =NULL ; +struct batadv_neigh_node *router_gw =NULL ; +struct batadv_neigh_node *router_orig =NULL ;u8 gw_tq_avg, orig_tq_avg; curr_gw_orig =batadv_gw_get_selected_orig (bat_priv);
@@ -808,9 +811,11 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,bool batadv_gw_out_of_range (struct batadv_priv *bat_priv,struct sk_buff *skb) { -struct batadv_neigh_node *neigh_curr =NULL , *neigh_old =NULL ; +struct batadv_neigh_node *neigh_curr =NULL ; +struct batadv_neigh_node *neigh_old =NULL ;struct batadv_orig_node *orig_dst_node =NULL ; -struct batadv_gw_node *gw_node =NULL , *curr_gw =NULL ; +struct batadv_gw_node *gw_node =NULL ; +struct batadv_gw_node *curr_gw =NULL ;struct batadv_neigh_ifinfo *curr_ifinfo, *old_ifinfo;struct ethhdr *ethhdr = (struct ethhdr *)skb->data;bool out_of_range = false;
net/batman-adv/gateway_common.c +4 -1
@@ -149,7 +149,10 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count) {struct batadv_priv *bat_priv =netdev_priv (net_dev); -u32 down_curr, up_curr, down_new =0 , up_new =0 ; +u32 down_curr; +u32 up_curr; +u32 down_new =0 ; +u32 up_new =0 ;bool ret; down_curr = (unsigned int )atomic_read (&bat_priv->gw.bandwidth_down);
net/batman-adv/network-coding.c +2 -1
@@ -887,7 +887,8 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv, struct batadv_ogm_packet *ogm_packet, int is_single_hop_neigh) { -struct batadv_nc_node *in_nc_node =NULL , *out_nc_node =NULL ; +struct batadv_nc_node *in_nc_node =NULL ; +struct batadv_nc_node *out_nc_node =NULL ;/* Check if network coding is enabled */ if (!atomic_read (&bat_priv->network_coding))
net/batman-adv/translation-table.c +13 -5
@@ -462,7 +462,8 @@ static u16 batadv_tt_entries(u16 tt_len)*/ static int batadv_tt_local_table_transmit_size (struct batadv_priv *bat_priv) { -u16 num_vlan =0 , tt_local_entries =0 ; +u16 num_vlan =0 ; +u16 tt_local_entries =0 ;struct batadv_softif_vlan *vlan;int hdr_size;
@@ -536,7 +537,8 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr,struct hlist_head *head;struct batadv_tt_orig_list_entry *orig_entry;int hash_added, table_size, packet_size_max; -bool ret = false, roamed_back = false; +bool ret = false; +bool roamed_back = false;u8 remote_flags;u32 match_mark;
@@ -730,7 +732,10 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node,struct batadv_tvlv_tt_change **tt_change, s32 *tt_len) { - u16 num_vlan = 0, num_entries = 0, change_offset, tvlv_len; + u16 num_vlan = 0; +u16 num_entries =0 ; +u16 change_offset; +u16 tvlv_len;struct batadv_tvlv_tt_vlan_data *tt_vlan;struct batadv_orig_node_vlan *vlan;u8 *tt_change_ptr;
@@ -803,7 +808,9 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, {struct batadv_tvlv_tt_vlan_data *tt_vlan;struct batadv_softif_vlan *vlan; -u16 num_vlan =0 , num_entries =0 , tvlv_len; +u16 num_vlan =0 ; +u16 num_entries =0 ; +u16 tvlv_len;u8 *tt_change_ptr;int change_offset;
@@ -860,7 +867,8 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv)struct batadv_tvlv_tt_data *tt_data;struct batadv_tvlv_tt_change *tt_change;int tt_diff_len, tt_change_len =0 ; -int tt_diff_entries_num =0 , tt_diff_entries_count =0 ; +int tt_diff_entries_num =0 ; +int tt_diff_entries_count =0 ;u16 tvlv_len; tt_diff_entries_num =atomic_read (&bat_priv->tt.local_changes);
Signature · 1 line
2.5.0
PATCH 3/15 batman-adv: Remove multiple assignment per line
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
The Linux CodingStyle disallows multiple assignments in a single line. (see chapter 1)
Reported-by Markus Pargmann <[email protected]>
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/bat_iv_ogm.c | 6 ++++-- net/batman-adv/bridge_loop_avoidance.c | 6 ++++-- net/batman-adv/distributed-arp-table.c | 3 ++- net/batman-adv/gateway_client.c | 15 ++++++++++----- net/batman-adv/gateway_common.c | 5 ++++- net/batman-adv/network-coding.c | 3 ++- net/batman-adv/translation-table.c | 18 +++++++++++++----- 7 files changed, 39 insertions(+), 17 deletions(-)
net/batman-adv/bat_iv_ogm.c +4 -2
@@ -1004,7 +1004,8 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, {struct batadv_neigh_ifinfo *neigh_ifinfo =NULL ;struct batadv_neigh_ifinfo *router_ifinfo =NULL ; -struct batadv_neigh_node *neigh_node =NULL , *tmp_neigh_node =NULL ; +struct batadv_neigh_node *neigh_node =NULL ; +struct batadv_neigh_node *tmp_neigh_node =NULL ;struct batadv_neigh_node *router =NULL ;struct batadv_orig_node *orig_node_tmp;int if_num;
@@ -1404,7 +1405,8 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, struct batadv_hard_iface *if_outgoing) {struct batadv_priv *bat_priv =netdev_priv (if_incoming->soft_iface); -struct batadv_neigh_node *router =NULL , *router_router =NULL ; +struct batadv_neigh_node *router =NULL ; +struct batadv_neigh_node *router_router =NULL ;struct batadv_orig_node *orig_neigh_node;struct batadv_orig_ifinfo *orig_ifinfo;struct batadv_neigh_node *orig_neigh_router =NULL ;
net/batman-adv/bridge_loop_avoidance.c +4 -2
@@ -88,7 +88,8 @@ static int batadv_compare_backbone_gw(const struct hlist_node *node, { const void *data1 = container_of(node, struct batadv_bla_backbone_gw, hash_entry); -const struct batadv_bla_backbone_gw *gw1 = data1, *gw2 = data2; +const struct batadv_bla_backbone_gw *gw1 = data1; +const struct batadv_bla_backbone_gw *gw2 = data2;if (!batadv_compare_eth (gw1->orig, gw2->orig))return 0 ;
@@ -105,7 +106,8 @@ static int batadv_compare_claim(const struct hlist_node *node, { const void *data1 = container_of(node, struct batadv_bla_claim, hash_entry); -const struct batadv_bla_claim *cl1 = data1, *cl2 = data2; +const struct batadv_bla_claim *cl1 = data1; +const struct batadv_bla_claim *cl2 = data2;if (!batadv_compare_eth (cl1->addr, cl2->addr))return 0 ;
net/batman-adv/distributed-arp-table.c +2 -1
@@ -497,7 +497,8 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, int select, batadv_dat_addr_t ip_key, batadv_dat_addr_t *last_max) { - batadv_dat_addr_t max = 0, tmp_max = 0; + batadv_dat_addr_t max = 0; +batadv_dat_addr_t tmp_max =0 ;struct batadv_orig_node *orig_node, *max_orig_node =NULL ;struct batadv_hashtable *hash = bat_priv->orig_hash;struct hlist_head *head;
net/batman-adv/gateway_client.c +10 -5
@@ -153,7 +153,8 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv)struct batadv_neigh_node *router;struct batadv_neigh_ifinfo *router_ifinfo;struct batadv_gw_node *gw_node, *curr_gw =NULL ; -u64 max_gw_factor =0 , tmp_gw_factor =0 ; +u64 max_gw_factor =0 ; +u64 tmp_gw_factor =0 ;u8 max_tq =0 ;u8 tq_avg;struct batadv_orig_node *orig_node;
@@ -263,7 +264,8 @@ void batadv_gw_check_client_stop(struct batadv_priv *bat_priv)void batadv_gw_election (struct batadv_priv *bat_priv) { -struct batadv_gw_node *curr_gw =NULL , *next_gw =NULL ; +struct batadv_gw_node *curr_gw =NULL ; +struct batadv_gw_node *next_gw =NULL ;struct batadv_neigh_node *router =NULL ;struct batadv_neigh_ifinfo *router_ifinfo =NULL ;char gw_addr[18 ] = {'\0' };
@@ -347,7 +349,8 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv,struct batadv_neigh_ifinfo *router_orig_tq =NULL ;struct batadv_neigh_ifinfo *router_gw_tq =NULL ;struct batadv_orig_node *curr_gw_orig; -struct batadv_neigh_node *router_gw =NULL , *router_orig =NULL ; +struct batadv_neigh_node *router_gw =NULL ; +struct batadv_neigh_node *router_orig =NULL ;u8 gw_tq_avg, orig_tq_avg; curr_gw_orig =batadv_gw_get_selected_orig (bat_priv);
@@ -808,9 +811,11 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,bool batadv_gw_out_of_range (struct batadv_priv *bat_priv,struct sk_buff *skb) { -struct batadv_neigh_node *neigh_curr =NULL , *neigh_old =NULL ; +struct batadv_neigh_node *neigh_curr =NULL ; +struct batadv_neigh_node *neigh_old =NULL ;struct batadv_orig_node *orig_dst_node =NULL ; -struct batadv_gw_node *gw_node =NULL , *curr_gw =NULL ; +struct batadv_gw_node *gw_node =NULL ; +struct batadv_gw_node *curr_gw =NULL ;struct batadv_neigh_ifinfo *curr_ifinfo, *old_ifinfo;struct ethhdr *ethhdr = (struct ethhdr *)skb->data;bool out_of_range = false;
net/batman-adv/gateway_common.c +4 -1
@@ -149,7 +149,10 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count) {struct batadv_priv *bat_priv =netdev_priv (net_dev); -u32 down_curr, up_curr, down_new =0 , up_new =0 ; +u32 down_curr; +u32 up_curr; +u32 down_new =0 ; +u32 up_new =0 ;bool ret; down_curr = (unsigned int )atomic_read (&bat_priv->gw.bandwidth_down);
net/batman-adv/network-coding.c +2 -1
@@ -887,7 +887,8 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv, struct batadv_ogm_packet *ogm_packet, int is_single_hop_neigh) { -struct batadv_nc_node *in_nc_node =NULL , *out_nc_node =NULL ; +struct batadv_nc_node *in_nc_node =NULL ; +struct batadv_nc_node *out_nc_node =NULL ;/* Check if network coding is enabled */ if (!atomic_read (&bat_priv->network_coding))
net/batman-adv/translation-table.c +13 -5
@@ -462,7 +462,8 @@ static u16 batadv_tt_entries(u16 tt_len)*/ static int batadv_tt_local_table_transmit_size (struct batadv_priv *bat_priv) { -u16 num_vlan =0 , tt_local_entries =0 ; +u16 num_vlan =0 ; +u16 tt_local_entries =0 ;struct batadv_softif_vlan *vlan;int hdr_size;
@@ -536,7 +537,8 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr,struct hlist_head *head;struct batadv_tt_orig_list_entry *orig_entry;int hash_added, table_size, packet_size_max; -bool ret = false, roamed_back = false; +bool ret = false; +bool roamed_back = false;u8 remote_flags;u32 match_mark;
@@ -730,7 +732,10 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node,struct batadv_tvlv_tt_change **tt_change, s32 *tt_len) { - u16 num_vlan = 0, num_entries = 0, change_offset, tvlv_len; + u16 num_vlan = 0; +u16 num_entries =0 ; +u16 change_offset; +u16 tvlv_len;struct batadv_tvlv_tt_vlan_data *tt_vlan;struct batadv_orig_node_vlan *vlan;u8 *tt_change_ptr;
@@ -803,7 +808,9 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, {struct batadv_tvlv_tt_vlan_data *tt_vlan;struct batadv_softif_vlan *vlan; -u16 num_vlan =0 , num_entries =0 , tvlv_len; +u16 num_vlan =0 ; +u16 num_entries =0 ; +u16 tvlv_len;u8 *tt_change_ptr;int change_offset;
@@ -860,7 +867,8 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv)struct batadv_tvlv_tt_data *tt_data;struct batadv_tvlv_tt_change *tt_change;int tt_diff_len, tt_change_len =0 ; -int tt_diff_entries_num =0 , tt_diff_entries_count =0 ; +int tt_diff_entries_num =0 ; +int tt_diff_entries_count =0 ;u16 tvlv_len; tt_diff_entries_num =atomic_read (&bat_priv->tt.local_changes);
Signature · 1 line
2.5.0
PATCH 4/15 batman-adv: update kernel doc of batadv_tt_global_del_orig_entry()
In reply to Antonio QuartulliFrom: Marek Lindner <[email protected]>
The updated kernel doc & additional comment shall prevent accidental copy & paste errors or calling the function without the required precautions.
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/translation-table.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
net/batman-adv/translation-table.c +12 -6
@@ -1658,20 +1658,26 @@ out: }/** -* batadv_tt_global_del_orig_entry - remove and free an orig_entry +* _batadv_tt_global_del_orig_entry - remove and free an orig_entry * @tt_global_entry: the global entry to remove the orig_entry from * @orig_entry: the orig entry to remove and free * * Remove an orig_entry from its list in the given tt_global_entry and * free this orig_entry afterwards. +* +* Caller must hold tt_global_entry->list_lock and ensure orig_entry->list is +* part of a list. */ static void -batadv_tt_global_del_orig_entry (struct batadv_tt_global_entry *tt_global_entry, -struct batadv_tt_orig_list_entry *orig_entry) +_batadv_tt_global_del_orig_entry (struct batadv_tt_global_entry *tt_global_entry, +struct batadv_tt_orig_list_entry *orig_entry) {batadv_tt_global_size_dec (orig_entry->orig_node, tt_global_entry->common.vid);atomic_dec (&tt_global_entry->orig_list_count); +/* requires holding tt_global_entry->list_lock and orig_entry->list +* being part of a list +*/ hlist_del_rcu (&orig_entry->list);batadv_tt_orig_list_entry_free_ref (orig_entry); }
@@ -1687,7 +1693,7 @@ batadv_tt_global_del_orig_list(struct batadv_tt_global_entry *tt_global_entry)spin_lock_bh (&tt_global_entry->list_lock); head = &tt_global_entry->orig_list;hlist_for_each_entry_safe (orig_entry, safe, head, list) -batadv_tt_global_del_orig_entry (tt_global_entry, orig_entry); +_batadv_tt_global_del_orig_entry (tt_global_entry, orig_entry);spin_unlock_bh (&tt_global_entry->list_lock); }
@@ -1722,8 +1728,8 @@ batadv_tt_global_del_orig_node(struct batadv_priv *bat_priv, orig_node->orig, tt_global_entry->common.addr, BATADV_PRINT_VID(vid), message); -batadv_tt_global_del_orig_entry (tt_global_entry, - orig_entry); +_batadv_tt_global_del_orig_entry (tt_global_entry, + orig_entry); } }spin_unlock_bh (&tt_global_entry->list_lock);
Signature · 1 line
2.5.0
PATCH 4/15 batman-adv: update kernel doc of batadv_tt_global_del_orig_entry()
In reply to Antonio QuartulliFrom: Marek Lindner <[email protected]>
The updated kernel doc & additional comment shall prevent accidental copy & paste errors or calling the function without the required precautions.
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/translation-table.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
net/batman-adv/translation-table.c +12 -6
@@ -1658,20 +1658,26 @@ out: }/** -* batadv_tt_global_del_orig_entry - remove and free an orig_entry +* _batadv_tt_global_del_orig_entry - remove and free an orig_entry * @tt_global_entry: the global entry to remove the orig_entry from * @orig_entry: the orig entry to remove and free * * Remove an orig_entry from its list in the given tt_global_entry and * free this orig_entry afterwards. +* +* Caller must hold tt_global_entry->list_lock and ensure orig_entry->list is +* part of a list. */ static void -batadv_tt_global_del_orig_entry (struct batadv_tt_global_entry *tt_global_entry, -struct batadv_tt_orig_list_entry *orig_entry) +_batadv_tt_global_del_orig_entry (struct batadv_tt_global_entry *tt_global_entry, +struct batadv_tt_orig_list_entry *orig_entry) {batadv_tt_global_size_dec (orig_entry->orig_node, tt_global_entry->common.vid);atomic_dec (&tt_global_entry->orig_list_count); +/* requires holding tt_global_entry->list_lock and orig_entry->list +* being part of a list +*/ hlist_del_rcu (&orig_entry->list);batadv_tt_orig_list_entry_free_ref (orig_entry); }
@@ -1687,7 +1693,7 @@ batadv_tt_global_del_orig_list(struct batadv_tt_global_entry *tt_global_entry)spin_lock_bh (&tt_global_entry->list_lock); head = &tt_global_entry->orig_list;hlist_for_each_entry_safe (orig_entry, safe, head, list) -batadv_tt_global_del_orig_entry (tt_global_entry, orig_entry); +_batadv_tt_global_del_orig_entry (tt_global_entry, orig_entry);spin_unlock_bh (&tt_global_entry->list_lock); }
@@ -1722,8 +1728,8 @@ batadv_tt_global_del_orig_node(struct batadv_priv *bat_priv, orig_node->orig, tt_global_entry->common.addr, BATADV_PRINT_VID(vid), message); -batadv_tt_global_del_orig_entry (tt_global_entry, - orig_entry); +_batadv_tt_global_del_orig_entry (tt_global_entry, + orig_entry); } }spin_unlock_bh (&tt_global_entry->list_lock);
Signature · 1 line
2.5.0
PATCH 5/15 batman-adv: rename batadv_new_tt_req_node to batadv_tt_req_node_new
In reply to Antonio QuartulliFrom: Marek Lindner <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/translation-table.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
net/batman-adv/translation-table.c +9 -4
@@ -2272,11 +2272,16 @@ static void batadv_tt_req_purge(struct batadv_priv *bat_priv)spin_unlock_bh (&bat_priv->tt.req_list_lock); } -/* returns the pointer to the new tt_req_node struct if no request -* has already been issued for this orig_node, NULL otherwise +/** +* batadv_tt_req_node_new - search and possibly create a tt_req_node object +* @bat_priv: the bat priv with all the soft interface information +* @orig_node: orig node this request is being issued for +* +* Returns the pointer to the new tt_req_node struct if no request +* has already been issued for this orig_node, NULL otherwise. */ static struct batadv_tt_req_node * -batadv_new_tt_req_node (struct batadv_priv *bat_priv, +batadv_tt_req_node_new (struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node) {struct batadv_tt_req_node *tt_req_node_tmp, *tt_req_node =NULL ;
@@ -2505,7 +2510,7 @@ static int batadv_send_tt_request(struct batadv_priv *bat_priv,/* The new tt_req will be issued only if I'm not waiting for a * reply from the same orig_node yet */ - tt_req_node =batadv_new_tt_req_node (bat_priv, dst_orig_node); + tt_req_node =batadv_tt_req_node_new (bat_priv, dst_orig_node);if (!tt_req_node) goto out;
Signature · 1 line
2.5.0
PATCH 6/15 batman-adv: Remove batadv_ types forward declarations
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
main.h is included in every file and is the only way to access types.h. This makes forward declarations for all types defined in types.h unnecessary.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/bridge_loop_avoidance.h | 3 --- net/batman-adv/debugfs.h | 1 - net/batman-adv/gateway_common.h | 1 - net/batman-adv/icmp_socket.h | 1 - net/batman-adv/multicast.h | 2 -- net/batman-adv/network-coding.h | 4 ---- net/batman-adv/routing.h | 4 ---- net/batman-adv/send.h | 3 --- net/batman-adv/soft-interface.h | 4 ---- net/batman-adv/sysfs.h | 2 -- net/batman-adv/translation-table.h | 2 -- 11 files changed, 27 deletions(-)
net/batman-adv/bridge_loop_avoidance.h +0 -3
@@ -22,9 +22,6 @@#include <linux/types.h> -struct batadv_hard_iface ; -struct batadv_orig_node ; -struct batadv_priv ;struct seq_file ;struct sk_buff ;
net/batman-adv/debugfs.h +0 -1
@@ -22,7 +22,6 @@#include <linux/kconfig.h> -struct batadv_hard_iface ;struct net_device ;#define BATADV_DEBUGFS_SUBDIR "batman_adv"
net/batman-adv/gateway_common.h +0 -1
@@ -22,7 +22,6 @@#include <linux/types.h> -struct batadv_priv ;struct net_device ;enum batadv_gw_modes {
net/batman-adv/icmp_socket.h +0 -1
@@ -23,7 +23,6 @@#include <linux/types.h> struct batadv_icmp_header ; -struct batadv_priv ;#define BATADV_ICMP_SOCKET "socket"
net/batman-adv/multicast.h +0 -2
@@ -20,8 +20,6 @@#include "main.h" -struct batadv_orig_node ; -struct batadv_priv ;struct sk_buff ;/**
net/batman-adv/network-coding.h +0 -4
@@ -22,11 +22,7 @@#include <linux/types.h> -struct batadv_nc_node ; -struct batadv_neigh_node ;struct batadv_ogm_packet ; -struct batadv_orig_node ; -struct batadv_priv ;struct net_device ;struct seq_file ;struct sk_buff ;
net/batman-adv/routing.h +0 -4
@@ -22,10 +22,6 @@#include <linux/types.h> -struct batadv_hard_iface ; -struct batadv_neigh_node ; -struct batadv_orig_node ; -struct batadv_priv ;struct sk_buff ; bool batadv_check_management_packet(struct sk_buff *skb,
net/batman-adv/send.h +0 -3
@@ -25,9 +25,6 @@#include "packet.h" -struct batadv_hard_iface ; -struct batadv_orig_node ; -struct batadv_priv ;struct sk_buff ;struct work_struct ;
net/batman-adv/soft-interface.h +0 -4
@@ -22,10 +22,6 @@#include <net/rtnetlink.h> -struct batadv_hard_iface ; -struct batadv_orig_node ; -struct batadv_priv ; -struct batadv_softif_vlan ;struct net_device ;struct sk_buff ;
net/batman-adv/sysfs.h +0 -2
@@ -23,8 +23,6 @@#include <linux/sysfs.h> #include <linux/types.h> -struct batadv_priv ; -struct batadv_softif_vlan ;struct kobject ;struct net_device ;
net/batman-adv/translation-table.h +0 -2
@@ -22,8 +22,6 @@#include <linux/types.h> -struct batadv_orig_node ; -struct batadv_priv ;struct net_device ;struct seq_file ;
Signature · 1 line
2.5.0
PATCH 7/15 batman-adv: convert orig_node->vlan_list to hlist
In reply to Antonio QuartulliFrom: Marek Lindner <[email protected]>
Since the list's tail is never accessed using a double linked list head wastes memory.
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/originator.c | 7 ++++--- net/batman-adv/translation-table.c | 8 ++++---- net/batman-adv/types.h | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-)
net/batman-adv/originator.c +4 -3
@@ -26,6 +26,7 @@#include <linux/list.h> #include <linux/lockdep.h> #include <linux/netdevice.h> +#include <linux/rculist.h> #include <linux/seq_file.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -70,7 +71,7 @@ batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node,struct batadv_orig_node_vlan *vlan =NULL , *tmp;rcu_read_lock (); -list_for_each_entry_rcu (tmp, &orig_node->vlan_list, list) { +hlist_for_each_entry_rcu (tmp, &orig_node->vlan_list, list) {if (tmp->vid != vid)continue ;
@@ -118,7 +119,7 @@ batadv_orig_node_vlan_new(struct batadv_orig_node *orig_node,atomic_set (&vlan->refcount,2 ); vlan->vid = vid; -list_add_rcu (&vlan->list, &orig_node->vlan_list); +hlist_add_head_rcu (&vlan->list, &orig_node->vlan_list); out:spin_unlock_bh (&orig_node->vlan_list_lock);
@@ -673,7 +674,7 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,return NULL ;INIT_HLIST_HEAD (&orig_node->neigh_list); -INIT_LIST_HEAD (&orig_node->vlan_list); +INIT_HLIST_HEAD (&orig_node->vlan_list);INIT_HLIST_HEAD (&orig_node->ifinfo_list);spin_lock_init (&orig_node->bcast_seqno_lock);spin_lock_init (&orig_node->neigh_list_lock);
net/batman-adv/translation-table.c +4 -4
@@ -315,7 +315,7 @@ static void batadv_tt_global_size_mod(struct batadv_orig_node *orig_node,if (atomic_add_return (v, &vlan->tt.num_entries) ==0 ) {spin_lock_bh (&orig_node->vlan_list_lock); -list_del_rcu (&vlan->list); +hlist_del_rcu (&vlan->list);spin_unlock_bh (&orig_node->vlan_list_lock);batadv_orig_node_vlan_free_ref (vlan); }
@@ -741,7 +741,7 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node,u8 *tt_change_ptr;rcu_read_lock (); -list_for_each_entry_rcu (vlan, &orig_node->vlan_list, list) { +hlist_for_each_entry_rcu (vlan, &orig_node->vlan_list, list) { num_vlan++; num_entries +=atomic_read (&vlan->tt.num_entries); }
@@ -767,7 +767,7 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node, (*tt_data)->num_vlan =htons (num_vlan); tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(*tt_data +1 ); -list_for_each_entry_rcu (vlan, &orig_node->vlan_list, list) { +hlist_for_each_entry_rcu (vlan, &orig_node->vlan_list, list) { tt_vlan->vid =htons (vlan->vid); tt_vlan->crc =htonl (vlan->tt.crc);
@@ -2466,7 +2466,7 @@ static void batadv_tt_global_update_crc(struct batadv_priv *bat_priv,/* recompute the global CRC for each VLAN */ rcu_read_lock (); -list_for_each_entry_rcu (vlan, &orig_node->vlan_list, list) { +hlist_for_each_entry_rcu (vlan, &orig_node->vlan_list, list) {/* if orig_node is a backbone node for this VLAN, don't compute * the CRC as we ignore all the global entries over it */
net/batman-adv/types.h +2 -2
@@ -190,7 +190,7 @@ struct batadv_vlan_tt {struct batadv_orig_node_vlan {unsigned short vid;struct batadv_vlan_tt tt; -struct list_head list; +struct hlist_node list;atomic_t refcount;struct rcu_head rcu; };
@@ -302,7 +302,7 @@ struct batadv_orig_node {spinlock_t out_coding_list_lock;/* Protects out_coding_list */ #endif struct batadv_frag_table_entry fragments[BATADV_FRAG_BUFFER_COUNT ]; -struct list_head vlan_list; +struct hlist_head vlan_list;spinlock_t vlan_list_lock;/* protects vlan_list */ struct batadv_orig_bat_iv bat_iv; };
Signature · 1 line
2.5.0
PATCH 8/15 batman-adv: prevent potential hlist double deletion
In reply to Antonio QuartulliFrom: Marek Lindner <[email protected]>
The hlist_del_rcu() call in batadv_tt_global_size_mod() does not check if the element still is part of the list prior to deletion. The atomic list counter should prevent the worst but converting to hlist_del_init_rcu() ensures the element can't be deleted more than once.
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/translation-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/translation-table.c +1 -1
@@ -315,7 +315,7 @@ static void batadv_tt_global_size_mod(struct batadv_orig_node *orig_node,if (atomic_add_return (v, &vlan->tt.num_entries) ==0 ) {spin_lock_bh (&orig_node->vlan_list_lock); -hlist_del_rcu (&vlan->list); +hlist_del_init_rcu (&vlan->list);spin_unlock_bh (&orig_node->vlan_list_lock);batadv_orig_node_vlan_free_ref (vlan); }
Signature · 1 line
2.5.0
PATCH 9/15 batman-adv: Return EINVAL on invalid gw_bandwidth change
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
Invalid speed settings by the user are currently acknowledged as correct but not stored. Instead the return of the store operation of the file "gw_bandwidth" should indicate that the given value is not acceptable.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/gateway_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/batman-adv/gateway_common.c +2 -2
@@ -19,6 +19,7 @@#include "main.h" #include <linux/atomic.h> +#include <linux/errno.h> #include <linux/byteorder/generic.h> #include <linux/kernel.h> #include <linux/netdevice.h>
@@ -160,7 +161,7 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, ret =batadv_parse_gw_bandwidth (net_dev, buff, &down_new, &up_new);if (!ret) - goto end; +return -EINVAL ;if (!down_new) down_new =1 ;
@@ -184,7 +185,6 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff,atomic_set (&bat_priv->gw.bandwidth_up, up_new);batadv_gw_tvlv_container_update (bat_priv); -end:return count; }
Signature · 1 line
2.5.0
PATCH 10/15 batman-adv: Fix gw_bandwidth calculation on 32 bit systems
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
The TVLV for the gw_bandwidth stores everything as u32. But the gw_bandwidth reads the signed long which limits the maximum value to (2 ** 31 - 1) on systems with 4 byte long. Also the input value is always converted from either Mibit/s or Kibit/s to 100Kibit/s. This reduces the values even further when the user sets it via the default unit Kibit/s. It may even cause an integer overflow and end up with a value the user never intended.
Instead read the values as u64, check for possible overflows, do the unit adjustments and then reduce the size to u32.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/gateway_common.c | 49 +++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 7 deletions(-)
net/batman-adv/gateway_common.c +42 -7
@@ -22,6 +22,7 @@#include <linux/errno.h> #include <linux/byteorder/generic.h> #include <linux/kernel.h> +#include <linux/math64.h> #include <linux/netdevice.h> #include <linux/stddef.h> #include <linux/string.h>
@@ -44,7 +45,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, {enum batadv_bandwidth_units bw_unit_type =BATADV_BW_UNIT_KBIT ;char *slash_ptr, *tmp_ptr; -long ldown, lup; +u64 ldown, lup;int ret; slash_ptr =strchr (buff,'/' );
@@ -62,7 +63,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, *tmp_ptr ='\0' ; } - ret =kstrtol (buff,10 , &ldown); + ret =kstrtou64 (buff,10 , &ldown);if (ret) { batadv_err(net_dev, "Download speed of gateway mode invalid: %s\n",
@@ -72,14 +73,31 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff,switch (bw_unit_type) {case BATADV_BW_UNIT_MBIT : - *down = ldown *10 ; +/* prevent overflow */ +if (U64_MAX /10 < ldown) { +batadv_err (net_dev, +"Download speed of gateway mode too large: %s\n" , + buff); +return false; + } + + ldown *=10 ;break ;case BATADV_BW_UNIT_KBIT :default : - *down = ldown /100 ; + ldown =div_u64 (ldown,100 );break ; } +if (U32_MAX < ldown) { +batadv_err (net_dev, +"Download speed of gateway mode too large: %s\n" , + buff); +return false; + } + + *down = ldown; +/* we also got some upload info */ if (slash_ptr) { bw_unit_type =BATADV_BW_UNIT_KBIT ;
@@ -95,7 +113,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, *tmp_ptr ='\0' ; } - ret =kstrtol (slash_ptr +1 ,10 , &lup); + ret =kstrtou64 (slash_ptr +1 ,10 , &lup);if (ret) { batadv_err(net_dev, "Upload speed of gateway mode invalid: %s\n",
@@ -105,13 +123,30 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff,switch (bw_unit_type) {case BATADV_BW_UNIT_MBIT : - *up = lup *10 ; +/* prevent overflow */ +if (U64_MAX /10 < lup) { +batadv_err (net_dev, +"Upload speed of gateway mode too large: %s\n" , + slash_ptr +1 ); +return false; + } + + lup *=10 ;break ;case BATADV_BW_UNIT_KBIT :default : - *up = lup /100 ; + lup =div_u64 (lup,100 );break ; } + +if (U32_MAX < lup) { +batadv_err (net_dev, +"Upload speed of gateway mode too large: %s\n" , + slash_ptr +1 ); +return false; + } + + *up = lup; }return true;
Signature · 1 line
2.5.0
PATCH 10/15 batman-adv: Fix gw_bandwidth calculation on 32 bit systems
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
The TVLV for the gw_bandwidth stores everything as u32. But the gw_bandwidth reads the signed long which limits the maximum value to (2 ** 31 - 1) on systems with 4 byte long. Also the input value is always converted from either Mibit/s or Kibit/s to 100Kibit/s. This reduces the values even further when the user sets it via the default unit Kibit/s. It may even cause an integer overflow and end up with a value the user never intended.
Instead read the values as u64, check for possible overflows, do the unit adjustments and then reduce the size to u32.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/gateway_common.c | 49 +++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 7 deletions(-)
net/batman-adv/gateway_common.c +42 -7
@@ -22,6 +22,7 @@#include <linux/errno.h> #include <linux/byteorder/generic.h> #include <linux/kernel.h> +#include <linux/math64.h> #include <linux/netdevice.h> #include <linux/stddef.h> #include <linux/string.h>
@@ -44,7 +45,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, {enum batadv_bandwidth_units bw_unit_type =BATADV_BW_UNIT_KBIT ;char *slash_ptr, *tmp_ptr; -long ldown, lup; +u64 ldown, lup;int ret; slash_ptr =strchr (buff,'/' );
@@ -62,7 +63,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, *tmp_ptr ='\0' ; } - ret =kstrtol (buff,10 , &ldown); + ret =kstrtou64 (buff,10 , &ldown);if (ret) { batadv_err(net_dev, "Download speed of gateway mode invalid: %s\n",
@@ -72,14 +73,31 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff,switch (bw_unit_type) {case BATADV_BW_UNIT_MBIT : - *down = ldown *10 ; +/* prevent overflow */ +if (U64_MAX /10 < ldown) { +batadv_err (net_dev, +"Download speed of gateway mode too large: %s\n" , + buff); +return false; + } + + ldown *=10 ;break ;case BATADV_BW_UNIT_KBIT :default : - *down = ldown /100 ; + ldown =div_u64 (ldown,100 );break ; } +if (U32_MAX < ldown) { +batadv_err (net_dev, +"Download speed of gateway mode too large: %s\n" , + buff); +return false; + } + + *down = ldown; +/* we also got some upload info */ if (slash_ptr) { bw_unit_type =BATADV_BW_UNIT_KBIT ;
@@ -95,7 +113,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, *tmp_ptr ='\0' ; } - ret =kstrtol (slash_ptr +1 ,10 , &lup); + ret =kstrtou64 (slash_ptr +1 ,10 , &lup);if (ret) { batadv_err(net_dev, "Upload speed of gateway mode invalid: %s\n",
@@ -105,13 +123,30 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff,switch (bw_unit_type) {case BATADV_BW_UNIT_MBIT : - *up = lup *10 ; +/* prevent overflow */ +if (U64_MAX /10 < lup) { +batadv_err (net_dev, +"Upload speed of gateway mode too large: %s\n" , + slash_ptr +1 ); +return false; + } + + lup *=10 ;break ;case BATADV_BW_UNIT_KBIT :default : - *up = lup /100 ; + lup =div_u64 (lup,100 );break ; } + +if (U32_MAX < lup) { +batadv_err (net_dev, +"Upload speed of gateway mode too large: %s\n" , + slash_ptr +1 ); +return false; + } + + *up = lup; }return true;
Signature · 1 line
2.5.0
PATCH 11/15 batman-adv: convert bat_priv->tt.req_list to hlist
In reply to Antonio QuartulliFrom: Marek Lindner <[email protected]>
Since the list's tail is never accessed using a double linked list head wastes memory.
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/main.c | 2 +- net/batman-adv/translation-table.c | 29 ++++++++++++++++------------- net/batman-adv/types.h | 4 ++-- 3 files changed, 19 insertions(+), 16 deletions(-)
net/batman-adv/main.c +1 -1
@@ -148,7 +148,7 @@ int batadv_mesh_init(struct net_device *soft_iface)INIT_HLIST_HEAD (&bat_priv->mcast.want_all_ipv6_list);#endif INIT_LIST_HEAD (&bat_priv->tt.changes_list); -INIT_LIST_HEAD (&bat_priv->tt.req_list); +INIT_HLIST_HEAD (&bat_priv->tt.req_list);INIT_LIST_HEAD (&bat_priv->tt.roam_list);#ifdef CONFIG_BATMAN_ADV_MCAST INIT_HLIST_HEAD (&bat_priv->mcast.mla_list);
net/batman-adv/translation-table.c +16 -13
@@ -2224,12 +2224,13 @@ static u32 batadv_tt_local_crc(struct batadv_priv *bat_priv,static void batadv_tt_req_list_free (struct batadv_priv *bat_priv) { -struct batadv_tt_req_node *node, *safe; +struct batadv_tt_req_node *node; +struct hlist_node *safe;spin_lock_bh (&bat_priv->tt.req_list_lock); -list_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) { -list_del_init (&node->list); +hlist_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) { +hlist_del_init (&node->list);kfree (node); }
@@ -2259,13 +2260,14 @@ static void batadv_tt_save_orig_buffer(struct batadv_priv *bat_priv,static void batadv_tt_req_purge (struct batadv_priv *bat_priv) { -struct batadv_tt_req_node *node, *safe; +struct batadv_tt_req_node *node; +struct hlist_node *safe;spin_lock_bh (&bat_priv->tt.req_list_lock); -list_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) { +hlist_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) {if (batadv_has_timed_out (node->issued_at,BATADV_TT_REQUEST_TIMEOUT )) { -list_del_init (&node->list); +hlist_del_init (&node->list);kfree (node); } }
@@ -2287,7 +2289,7 @@ batadv_tt_req_node_new(struct batadv_priv *bat_priv,struct batadv_tt_req_node *tt_req_node_tmp, *tt_req_node =NULL ;spin_lock_bh (&bat_priv->tt.req_list_lock); -list_for_each_entry (tt_req_node_tmp, &bat_priv->tt.req_list, list) { +hlist_for_each_entry (tt_req_node_tmp, &bat_priv->tt.req_list, list) {if (batadv_compare_eth (tt_req_node_tmp, orig_node) && !batadv_has_timed_out (tt_req_node_tmp->issued_at,BATADV_TT_REQUEST_TIMEOUT ))
@@ -2301,7 +2303,7 @@ batadv_tt_req_node_new(struct batadv_priv *bat_priv,ether_addr_copy (tt_req_node->addr, orig_node->orig); tt_req_node->issued_at = jiffies; -list_add (&tt_req_node->list, &bat_priv->tt.req_list); +hlist_add_head (&tt_req_node->list, &bat_priv->tt.req_list); unlock:spin_unlock_bh (&bat_priv->tt.req_list_lock);return tt_req_node;
@@ -2552,8 +2554,8 @@ out:batadv_hardif_free_ref (primary_if);if (ret && tt_req_node) {spin_lock_bh (&bat_priv->tt.req_list_lock); -/* list_del_init() verifies tt_req_node still is in the list */ -list_del_init (&tt_req_node->list); +/* hlist_del_init() verifies tt_req_node still is in the list */ +hlist_del_init (&tt_req_node->list);spin_unlock_bh (&bat_priv->tt.req_list_lock);kfree (tt_req_node); }
@@ -2949,7 +2951,8 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv,struct batadv_tvlv_tt_data *tt_data, u8 *resp_src, u16 num_entries) { - struct batadv_tt_req_node *node, *safe; + struct batadv_tt_req_node *node; +struct hlist_node *safe;struct batadv_orig_node *orig_node =NULL ;struct batadv_tvlv_tt_change *tt_change;u8 *tvlv_ptr = (u8 *)tt_data;
@@ -2987,10 +2990,10 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv,/* Delete the tt_req_node from pending tt_requests list */ spin_lock_bh (&bat_priv->tt.req_list_lock); -list_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) { +hlist_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) {if (!batadv_compare_eth (node->addr, resp_src))continue ; -list_del_init (&node->list); +hlist_del_init (&node->list);kfree (node); }
net/batman-adv/types.h +2 -2
@@ -537,7 +537,7 @@ struct batadv_priv_tt {struct list_head changes_list;struct batadv_hashtable *local_hash;struct batadv_hashtable *global_hash; -struct list_head req_list; +struct hlist_head req_list;struct list_head roam_list;spinlock_t changes_list_lock;/* protects changes */ spinlock_t req_list_lock;/* protects req_list */
@@ -1006,7 +1006,7 @@ struct batadv_tt_change_node {struct batadv_tt_req_node {u8 addr[ETH_ALEN ];unsigned long issued_at; -struct list_head list; +struct hlist_node list; };/**
Signature · 1 line
2.5.0
PATCH 11/15 batman-adv: convert bat_priv->tt.req_list to hlist
In reply to Antonio QuartulliFrom: Marek Lindner <[email protected]>
Since the list's tail is never accessed using a double linked list head wastes memory.
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/main.c | 2 +- net/batman-adv/translation-table.c | 29 ++++++++++++++++------------- net/batman-adv/types.h | 4 ++-- 3 files changed, 19 insertions(+), 16 deletions(-)
net/batman-adv/main.c +1 -1
@@ -148,7 +148,7 @@ int batadv_mesh_init(struct net_device *soft_iface)INIT_HLIST_HEAD (&bat_priv->mcast.want_all_ipv6_list);#endif INIT_LIST_HEAD (&bat_priv->tt.changes_list); -INIT_LIST_HEAD (&bat_priv->tt.req_list); +INIT_HLIST_HEAD (&bat_priv->tt.req_list);INIT_LIST_HEAD (&bat_priv->tt.roam_list);#ifdef CONFIG_BATMAN_ADV_MCAST INIT_HLIST_HEAD (&bat_priv->mcast.mla_list);
net/batman-adv/translation-table.c +16 -13
@@ -2224,12 +2224,13 @@ static u32 batadv_tt_local_crc(struct batadv_priv *bat_priv,static void batadv_tt_req_list_free (struct batadv_priv *bat_priv) { -struct batadv_tt_req_node *node, *safe; +struct batadv_tt_req_node *node; +struct hlist_node *safe;spin_lock_bh (&bat_priv->tt.req_list_lock); -list_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) { -list_del_init (&node->list); +hlist_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) { +hlist_del_init (&node->list);kfree (node); }
@@ -2259,13 +2260,14 @@ static void batadv_tt_save_orig_buffer(struct batadv_priv *bat_priv,static void batadv_tt_req_purge (struct batadv_priv *bat_priv) { -struct batadv_tt_req_node *node, *safe; +struct batadv_tt_req_node *node; +struct hlist_node *safe;spin_lock_bh (&bat_priv->tt.req_list_lock); -list_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) { +hlist_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) {if (batadv_has_timed_out (node->issued_at,BATADV_TT_REQUEST_TIMEOUT )) { -list_del_init (&node->list); +hlist_del_init (&node->list);kfree (node); } }
@@ -2287,7 +2289,7 @@ batadv_tt_req_node_new(struct batadv_priv *bat_priv,struct batadv_tt_req_node *tt_req_node_tmp, *tt_req_node =NULL ;spin_lock_bh (&bat_priv->tt.req_list_lock); -list_for_each_entry (tt_req_node_tmp, &bat_priv->tt.req_list, list) { +hlist_for_each_entry (tt_req_node_tmp, &bat_priv->tt.req_list, list) {if (batadv_compare_eth (tt_req_node_tmp, orig_node) && !batadv_has_timed_out (tt_req_node_tmp->issued_at,BATADV_TT_REQUEST_TIMEOUT ))
@@ -2301,7 +2303,7 @@ batadv_tt_req_node_new(struct batadv_priv *bat_priv,ether_addr_copy (tt_req_node->addr, orig_node->orig); tt_req_node->issued_at = jiffies; -list_add (&tt_req_node->list, &bat_priv->tt.req_list); +hlist_add_head (&tt_req_node->list, &bat_priv->tt.req_list); unlock:spin_unlock_bh (&bat_priv->tt.req_list_lock);return tt_req_node;
@@ -2552,8 +2554,8 @@ out:batadv_hardif_free_ref (primary_if);if (ret && tt_req_node) {spin_lock_bh (&bat_priv->tt.req_list_lock); -/* list_del_init() verifies tt_req_node still is in the list */ -list_del_init (&tt_req_node->list); +/* hlist_del_init() verifies tt_req_node still is in the list */ +hlist_del_init (&tt_req_node->list);spin_unlock_bh (&bat_priv->tt.req_list_lock);kfree (tt_req_node); }
@@ -2949,7 +2951,8 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv,struct batadv_tvlv_tt_data *tt_data, u8 *resp_src, u16 num_entries) { - struct batadv_tt_req_node *node, *safe; + struct batadv_tt_req_node *node; +struct hlist_node *safe;struct batadv_orig_node *orig_node =NULL ;struct batadv_tvlv_tt_change *tt_change;u8 *tvlv_ptr = (u8 *)tt_data;
@@ -2987,10 +2990,10 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv,/* Delete the tt_req_node from pending tt_requests list */ spin_lock_bh (&bat_priv->tt.req_list_lock); -list_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) { +hlist_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) {if (!batadv_compare_eth (node->addr, resp_src))continue ; -list_del_init (&node->list); +hlist_del_init (&node->list);kfree (node); }
net/batman-adv/types.h +2 -2
@@ -537,7 +537,7 @@ struct batadv_priv_tt {struct list_head changes_list;struct batadv_hashtable *local_hash;struct batadv_hashtable *global_hash; -struct list_head req_list; +struct hlist_head req_list;struct list_head roam_list;spinlock_t changes_list_lock;/* protects changes */ spinlock_t req_list_lock;/* protects req_list */
@@ -1006,7 +1006,7 @@ struct batadv_tt_change_node {struct batadv_tt_req_node {u8 addr[ETH_ALEN ];unsigned long issued_at; -struct list_head list; +struct hlist_node list; };/**
Signature · 1 line
2.5.0
PATCH 12/15 batman-adv: Annotate deleting functions with external lock via lockdep
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
Functions which use (h)list_del* are requiring correct locking when they operate on global lists. Most of the time the search in the list and the delete are done in the same function. All other cases should have it visible that they require a special lock to avoid race conditions.
Lockdep asserts can be used to check these problem during runtime when the lockdep functionality is enabled.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/main.c | 11 ++++++++--- net/batman-adv/multicast.c | 13 +++++++++++-- net/batman-adv/network-coding.c | 4 ++++ net/batman-adv/translation-table.c | 2 ++ 4 files changed, 25 insertions(+), 5 deletions(-)
net/batman-adv/main.c +8 -3
@@ -30,6 +30,7 @@#include <linux/ipv6.h> #include <linux/kernel.h> #include <linux/list.h> +#include <linux/lockdep.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/netdevice.h>
@@ -737,13 +738,17 @@ static u16 batadv_tvlv_container_list_size(struct batadv_priv *bat_priv)/** * batadv_tvlv_container_remove - remove tvlv container from the tvlv container * list +* @bat_priv: the bat priv with all the soft interface information * @tvlv: the to be removed tvlv container * * Has to be called with the appropriate locks being acquired * (tvlv.container_list_lock). */ -static void batadv_tvlv_container_remove (struct batadv_tvlv_container *tvlv) +static void batadv_tvlv_container_remove (struct batadv_priv *bat_priv, +struct batadv_tvlv_container *tvlv) { +lockdep_assert_held (&bat_priv->tvlv.handler_list_lock); +if (!tvlv)return ;
@@ -768,7 +773,7 @@ void batadv_tvlv_container_unregister(struct batadv_priv *bat_priv,spin_lock_bh (&bat_priv->tvlv.container_list_lock); tvlv =batadv_tvlv_container_get (bat_priv, type, version); -batadv_tvlv_container_remove (tvlv); +batadv_tvlv_container_remove (bat_priv, tvlv);spin_unlock_bh (&bat_priv->tvlv.container_list_lock); }
@@ -807,7 +812,7 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv,spin_lock_bh (&bat_priv->tvlv.container_list_lock); tvlv_old =batadv_tvlv_container_get (bat_priv, type, version); -batadv_tvlv_container_remove (tvlv_old); +batadv_tvlv_container_remove (bat_priv, tvlv_old);hlist_add_head (&tvlv_new->list, &bat_priv->tvlv.container_list);spin_unlock_bh (&bat_priv->tvlv.container_list_lock); }
net/batman-adv/multicast.c +11 -2
@@ -31,6 +31,7 @@#include <linux/ip.h> #include <linux/ipv6.h> #include <linux/list.h> +#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/rculist.h> #include <linux/rcupdate.h>
@@ -103,15 +104,19 @@ static bool batadv_mcast_mla_is_duplicate(u8 *mcast_addr,/** * batadv_mcast_mla_list_free - free a list of multicast addresses +* @bat_priv: the bat priv with all the soft interface information * @mcast_list: the list to free * * Removes and frees all items in the given mcast_list. */ -static void batadv_mcast_mla_list_free (struct hlist_head *mcast_list) +static void batadv_mcast_mla_list_free (struct batadv_priv *bat_priv, +struct hlist_head *mcast_list) {struct batadv_hw_addr *mcast_entry;struct hlist_node *tmp; +lockdep_assert_held (&bat_priv->tt.commit_lock); +hlist_for_each_entry_safe (mcast_entry, tmp, mcast_list, list) {hlist_del (&mcast_entry->list);kfree (mcast_entry);
@@ -134,6 +139,8 @@ static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv,struct batadv_hw_addr *mcast_entry;struct hlist_node *tmp; +lockdep_assert_held (&bat_priv->tt.commit_lock); +hlist_for_each_entry_safe (mcast_entry, tmp, &bat_priv->mcast.mla_list, list) { if (mcast_list &&
@@ -164,6 +171,8 @@ static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv,struct batadv_hw_addr *mcast_entry;struct hlist_node *tmp; +lockdep_assert_held (&bat_priv->tt.commit_lock); +if (!mcast_list)return ;
@@ -268,7 +277,7 @@ update:batadv_mcast_mla_tt_add (bat_priv, &mcast_list); out: -batadv_mcast_mla_list_free (&mcast_list); +batadv_mcast_mla_list_free (bat_priv, &mcast_list); }/**
net/batman-adv/network-coding.c +4 -0
@@ -586,6 +586,8 @@ static bool batadv_nc_sniffed_purge(struct batadv_priv *bat_priv,unsigned long timeout = bat_priv->nc.max_buffer_time;bool res = false; +lockdep_assert_held (&nc_path->packet_list_lock); +/* Packets are added to tail, so the remaining packets did not time * out and we can stop processing the current queue */
@@ -622,6 +624,8 @@ static bool batadv_nc_fwd_flush(struct batadv_priv *bat_priv, {unsigned long timeout = bat_priv->nc.max_fwd_delay; +lockdep_assert_held (&nc_path->packet_list_lock); +/* Packets are added to tail, so the remaining packets did not time * out and we can stop processing the current queue */
net/batman-adv/translation-table.c +2 -0
@@ -1672,6 +1672,8 @@ static void _batadv_tt_global_del_orig_entry(struct batadv_tt_global_entry *tt_global_entry, struct batadv_tt_orig_list_entry *orig_entry) { + lockdep_assert_held(&tt_global_entry->list_lock); +batadv_tt_global_size_dec (orig_entry->orig_node, tt_global_entry->common.vid);atomic_dec (&tt_global_entry->orig_list_count);
Signature · 1 line
2.5.0
PATCH 12/15 batman-adv: Annotate deleting functions with external lock via lockdep
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
Functions which use (h)list_del* are requiring correct locking when they operate on global lists. Most of the time the search in the list and the delete are done in the same function. All other cases should have it visible that they require a special lock to avoid race conditions.
Lockdep asserts can be used to check these problem during runtime when the lockdep functionality is enabled.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/main.c | 11 ++++++++--- net/batman-adv/multicast.c | 13 +++++++++++-- net/batman-adv/network-coding.c | 4 ++++ net/batman-adv/translation-table.c | 2 ++ 4 files changed, 25 insertions(+), 5 deletions(-)
net/batman-adv/main.c +8 -3
@@ -30,6 +30,7 @@#include <linux/ipv6.h> #include <linux/kernel.h> #include <linux/list.h> +#include <linux/lockdep.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/netdevice.h>
@@ -737,13 +738,17 @@ static u16 batadv_tvlv_container_list_size(struct batadv_priv *bat_priv)/** * batadv_tvlv_container_remove - remove tvlv container from the tvlv container * list +* @bat_priv: the bat priv with all the soft interface information * @tvlv: the to be removed tvlv container * * Has to be called with the appropriate locks being acquired * (tvlv.container_list_lock). */ -static void batadv_tvlv_container_remove (struct batadv_tvlv_container *tvlv) +static void batadv_tvlv_container_remove (struct batadv_priv *bat_priv, +struct batadv_tvlv_container *tvlv) { +lockdep_assert_held (&bat_priv->tvlv.handler_list_lock); +if (!tvlv)return ;
@@ -768,7 +773,7 @@ void batadv_tvlv_container_unregister(struct batadv_priv *bat_priv,spin_lock_bh (&bat_priv->tvlv.container_list_lock); tvlv =batadv_tvlv_container_get (bat_priv, type, version); -batadv_tvlv_container_remove (tvlv); +batadv_tvlv_container_remove (bat_priv, tvlv);spin_unlock_bh (&bat_priv->tvlv.container_list_lock); }
@@ -807,7 +812,7 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv,spin_lock_bh (&bat_priv->tvlv.container_list_lock); tvlv_old =batadv_tvlv_container_get (bat_priv, type, version); -batadv_tvlv_container_remove (tvlv_old); +batadv_tvlv_container_remove (bat_priv, tvlv_old);hlist_add_head (&tvlv_new->list, &bat_priv->tvlv.container_list);spin_unlock_bh (&bat_priv->tvlv.container_list_lock); }
net/batman-adv/multicast.c +11 -2
@@ -31,6 +31,7 @@#include <linux/ip.h> #include <linux/ipv6.h> #include <linux/list.h> +#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/rculist.h> #include <linux/rcupdate.h>
@@ -103,15 +104,19 @@ static bool batadv_mcast_mla_is_duplicate(u8 *mcast_addr,/** * batadv_mcast_mla_list_free - free a list of multicast addresses +* @bat_priv: the bat priv with all the soft interface information * @mcast_list: the list to free * * Removes and frees all items in the given mcast_list. */ -static void batadv_mcast_mla_list_free (struct hlist_head *mcast_list) +static void batadv_mcast_mla_list_free (struct batadv_priv *bat_priv, +struct hlist_head *mcast_list) {struct batadv_hw_addr *mcast_entry;struct hlist_node *tmp; +lockdep_assert_held (&bat_priv->tt.commit_lock); +hlist_for_each_entry_safe (mcast_entry, tmp, mcast_list, list) {hlist_del (&mcast_entry->list);kfree (mcast_entry);
@@ -134,6 +139,8 @@ static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv,struct batadv_hw_addr *mcast_entry;struct hlist_node *tmp; +lockdep_assert_held (&bat_priv->tt.commit_lock); +hlist_for_each_entry_safe (mcast_entry, tmp, &bat_priv->mcast.mla_list, list) { if (mcast_list &&
@@ -164,6 +171,8 @@ static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv,struct batadv_hw_addr *mcast_entry;struct hlist_node *tmp; +lockdep_assert_held (&bat_priv->tt.commit_lock); +if (!mcast_list)return ;
@@ -268,7 +277,7 @@ update:batadv_mcast_mla_tt_add (bat_priv, &mcast_list); out: -batadv_mcast_mla_list_free (&mcast_list); +batadv_mcast_mla_list_free (bat_priv, &mcast_list); }/**
net/batman-adv/network-coding.c +4 -0
@@ -586,6 +586,8 @@ static bool batadv_nc_sniffed_purge(struct batadv_priv *bat_priv,unsigned long timeout = bat_priv->nc.max_buffer_time;bool res = false; +lockdep_assert_held (&nc_path->packet_list_lock); +/* Packets are added to tail, so the remaining packets did not time * out and we can stop processing the current queue */
@@ -622,6 +624,8 @@ static bool batadv_nc_fwd_flush(struct batadv_priv *bat_priv, {unsigned long timeout = bat_priv->nc.max_fwd_delay; +lockdep_assert_held (&nc_path->packet_list_lock); +/* Packets are added to tail, so the remaining packets did not time * out and we can stop processing the current queue */
net/batman-adv/translation-table.c +2 -0
@@ -1672,6 +1672,8 @@ static void _batadv_tt_global_del_orig_entry(struct batadv_tt_global_entry *tt_global_entry, struct batadv_tt_orig_list_entry *orig_entry) { + lockdep_assert_held(&tt_global_entry->list_lock); +batadv_tt_global_size_dec (orig_entry->orig_node, tt_global_entry->common.vid);atomic_dec (&tt_global_entry->orig_list_count);
Signature · 1 line
2.5.0
PATCH 13/15 batman-adv: Add lockdep_asserts for documented external locks
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
Some functions already have documentation about locks they require inside their kerneldoc header. These can be directly tested during runtime using the lockdep asserts.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/fragmentation.c | 3 +++ net/batman-adv/multicast.c | 6 ++++++ net/batman-adv/translation-table.c | 2 ++ 3 files changed, 11 insertions(+)
net/batman-adv/fragmentation.c +3 -0
@@ -25,6 +25,7 @@#include <linux/if_ether.h> #include <linux/jiffies.h> #include <linux/kernel.h> +#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/pkt_sched.h> #include <linux/skbuff.h>
@@ -112,6 +113,8 @@ static int batadv_frag_size_limit(void)static bool batadv_frag_init_chain (struct batadv_frag_table_entry *chain,u16 seqno) { +lockdep_assert_held (&chain->lock); +if (chain->seqno == seqno)return false;
net/batman-adv/multicast.c +6 -0
@@ -609,6 +609,8 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,struct hlist_node *node = &orig->mcast_want_all_unsnoopables_node;struct hlist_head *head = &bat_priv->mcast.want_all_unsnoopables_list; +lockdep_assert_held (&orig->mcast_handler_lock); +/* switched from flag unset to set */ if (mcast_flags &BATADV_MCAST_WANT_ALL_UNSNOOPABLES && !(orig->mcast_flags &BATADV_MCAST_WANT_ALL_UNSNOOPABLES )) {
@@ -652,6 +654,8 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,struct hlist_node *node = &orig->mcast_want_all_ipv4_node;struct hlist_head *head = &bat_priv->mcast.want_all_ipv4_list; +lockdep_assert_held (&orig->mcast_handler_lock); +/* switched from flag unset to set */ if (mcast_flags &BATADV_MCAST_WANT_ALL_IPV4 && !(orig->mcast_flags &BATADV_MCAST_WANT_ALL_IPV4 )) {
@@ -695,6 +699,8 @@ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,struct hlist_node *node = &orig->mcast_want_all_ipv6_node;struct hlist_head *head = &bat_priv->mcast.want_all_ipv6_list; +lockdep_assert_held (&orig->mcast_handler_lock); +/* switched from flag unset to set */ if (mcast_flags &BATADV_MCAST_WANT_ALL_IPV6 && !(orig->mcast_flags &BATADV_MCAST_WANT_ALL_IPV6 )) {
net/batman-adv/translation-table.c +2 -0
@@ -3271,6 +3271,8 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv)*/ static void batadv_tt_local_commit_changes_nolock (struct batadv_priv *bat_priv) { +lockdep_assert_held (&bat_priv->tt.commit_lock); +/* Update multicast addresses in local translation table */ batadv_mcast_mla_update (bat_priv);
Signature · 1 line
2.5.0
PATCH 14/15 batman-adv: Fix conditional statements indentation
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
commit 29b9256e6631 ("batman-adv: consider outgoing interface in OGM sending") incorrectly indented the interface check code.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/bat_iv_ogm.c +1 -1
@@ -968,7 +968,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)rcu_read_lock ();list_for_each_entry_rcu (tmp_hard_iface, &batadv_hardif_list, list) {if (tmp_hard_iface->soft_iface != hard_iface->soft_iface) -continue ; +continue ;batadv_iv_ogm_queue_add (bat_priv, *ogm_buff, *ogm_buff_len, hard_iface, tmp_hard_iface,1 , send_time);
Signature · 1 line
2.5.0
PATCH 14/15 batman-adv: Fix conditional statements indentation
In reply to Antonio QuartulliFrom: Sven Eckelmann <[email protected]>
commit 29b9256e6631 ("batman-adv: consider outgoing interface in OGM sending") incorrectly indented the interface check code.
Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/bat_iv_ogm.c +1 -1
@@ -968,7 +968,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)rcu_read_lock ();list_for_each_entry_rcu (tmp_hard_iface, &batadv_hardif_list, list) {if (tmp_hard_iface->soft_iface != hard_iface->soft_iface) -continue ; +continue ;batadv_iv_ogm_queue_add (bat_priv, *ogm_buff, *ogm_buff_len, hard_iface, tmp_hard_iface,1 , send_time);
Signature · 1 line
2.5.0
PATCH 15/15 batman-adv: beautify supported routing algorithm list
In reply to Antonio QuartulliFrom: Marek Lindner <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/main.c +1 -1
@@ -584,7 +584,7 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)seq_puts (seq,"Available routing algorithms:\n" );hlist_for_each_entry (bat_algo_ops, &batadv_algo_list, list) { -seq_printf (seq,"%s\n" , bat_algo_ops->name); +seq_printf (seq," * %s\n" , bat_algo_ops->name); }return 0 ;
Signature · 1 line
2.5.0
PATCH 15/15 batman-adv: beautify supported routing algorithm list
In reply to Antonio QuartulliFrom: Marek Lindner <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/main.c +1 -1
@@ -584,7 +584,7 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)seq_puts (seq,"Available routing algorithms:\n" );hlist_for_each_entry (bat_algo_ops, &batadv_algo_list, list) { -seq_printf (seq,"%s\n" , bat_algo_ops->name); +seq_printf (seq," * %s\n" , bat_algo_ops->name); }return 0 ;
Signature · 1 line
2.5.0
David Miller
maintainerFrom: Antonio Quartulli <[email protected]>
Date: Tue, 25 Aug 2015 13:02:24 +0200
Quoted 7 lines
here you have another batch intended for net-next/linux-4.3.
Most of the patches are about code restyling and beautification, but we also a couple of non critical fixes which didn't make their way through net.
Please pull or let me know of any problem!
Pulled, thanks Antonio.