pull request: batman-adv 20150108
Subsystems (3)
Hello David,
this is a batch of patches intended for net-next.
In this patchset you have mostly cleanups and small corrections to issues reported by checkpatch.
One notable change is the addition of the DEBUG_FS dependency to the BATMAN_ADV_DEBUG symbol by Markus Pargmann. We add this dependency because all the information provided by the DEBUG feature is accessible only through debugfs.
Please pull or let me know of any problem!
Thanks a lot,
Antonio
The following changes since commit 44d84d7272e5848878a96029b8a8b6e86854f146:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2015-01-06 22:29:20 -0500)
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 9535395640edb23ba5cec2abb026c4ee51899722:
batman-adv: Kconfig, Add missing DEBUG_FS dependency (2015-01-07 22:17:11 +0100)
----------------------------------------------------------------
Included changes:
- remove useless return in void functions
- remove unused member 'primary_iface' from 'struct orig_node'
- improve existing kernel doc
- fix several checkpatch complaints
- ensure socket's control block is cleared for received skbs
- add missing DEBUG_FS dependency to BATMAN_ADV_DEBUG symbol
----------------------------------------------------------------
Antonio Quartulli (7):
batman-adv: avoid useless return in void functions
batman-adv: checkpatch - else is not generally useful after a break or return
batman-adv: checkpatch - No space is necessary after a cast
batman-adv: checkpatch - Please use a blank line after declarations
batman-adv: checkpatch - Please don't use multiple blank lines
batman-adv: checkpatch - remove unnecessary parentheses
batman-adv: fix misspelled words
Markus Pargmann (1):
batman-adv: Kconfig, Add missing DEBUG_FS dependency
Martin Hundebøll (5):
batman-adv: kernel doc fixes for bat_iv_ogm.c
batman-adv: kernel doc fixes for bridge_loop_avoidance.c
batman-adv: kernel doc fix for distributed-arp-table.h
batman-adv: kernel doc fixes for main.{c, h}
batman-adv: clear control block of received socket buffers
Simon Wunderlich (2):
batman-adv: remove obsolete variable primary_iface from orig_node
batman-adv: Start new development cycle
net/batman-adv/Kconfig | 1 + net/batman-adv/bat_iv_ogm.c | 15 +++++++-------- net/batman-adv/bitarray.c | 1 - net/batman-adv/bitarray.h | 3 +-- net/batman-adv/bridge_loop_avoidance.c | 17 +++++++---------- net/batman-adv/debugfs.c | 2 +- net/batman-adv/distributed-arp-table.c | 1 + net/batman-adv/distributed-arp-table.h | 4 +--- net/batman-adv/fragmentation.c | 1 - net/batman-adv/fragmentation.h | 3 +-- net/batman-adv/gateway_client.c | 1 + net/batman-adv/main.c | 10 ++++++---- net/batman-adv/main.h | 15 +++++++-------- net/batman-adv/multicast.h | 3 --- net/batman-adv/network-coding.c | 3 +-- net/batman-adv/originator.c | 1 - net/batman-adv/originator.h | 1 - net/batman-adv/packet.h | 5 +++-- net/batman-adv/routing.c | 3 +-- net/batman-adv/soft-interface.c | 1 - net/batman-adv/sysfs.c | 1 - net/batman-adv/translation-table.c | 8 +++----- net/batman-adv/types.h | 4 +--- 23 files changed, 43 insertions(+), 61 deletions(-)
A message that is not in the archive (sent off-list or not yet received): 1420730120-9844-1-git-send-email-antonio-x4xJYDvStAgysxA8WJXlww@public.gmane.org
PATCH 1/15 batman-adv: avoid useless return in void functions
Cc Linus Lüssing <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/debugfs.c | 1 - net/batman-adv/multicast.h | 3 --- 2 files changed, 4 deletions(-)
net/batman-adv/debugfs.c +0 -1
@@ -233,7 +233,6 @@ static int batadv_debug_log_setup(struct batadv_priv *bat_priv)static void batadv_debug_log_cleanup (struct batadv_priv *bat_priv) { -return ; }#endif
net/batman-adv/multicast.h +0 -3
@@ -50,7 +50,6 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node);static inline void batadv_mcast_mla_update (struct batadv_priv *bat_priv) { -return ; } static inline enum batadv_forw_mode
@@ -67,12 +66,10 @@ static inline int batadv_mcast_init(struct batadv_priv *bat_priv)static inline void batadv_mcast_free (struct batadv_priv *bat_priv) { -return ; }static inline void batadv_mcast_purge_orig (struct batadv_orig_node *orig_node) { -return ; }#endif /* CONFIG_BATMAN_ADV_MCAST */
Signature · 1 line
2.2.1
PATCH 2/15 batman-adv: remove obsolete variable primary_iface from orig_node
In reply to a message not in the archiveFrom: Simon Wunderlich <[email protected]>
This variable became obsolete when changing to the new bonding mechanism based on the multi interface optimization. Since its not used anywhere, remove it.
Reported-by Linus Lüssing <[email protected]>
Signed-off-by Simon Wunderlich <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/types.h | 2 -- 1 file changed, 2 deletions(-)
net/batman-adv/types.h +0 -2
@@ -199,7 +199,6 @@ struct batadv_orig_bat_iv {/** * struct batadv_orig_node - structure for orig_list maintaining nodes of mesh * @orig: originator ethernet address -* @primary_addr: hosts primary interface address * @ifinfo_list: list for routers per outgoing interface * @last_bonding_candidate: pointer to last ifinfo of last used router * @batadv_dat_addr_t: address of the orig node in the distributed hash
@@ -244,7 +243,6 @@ struct batadv_orig_bat_iv {*/ struct batadv_orig_node {uint8_t orig[ETH_ALEN ]; -uint8_t primary_addr[ETH_ALEN ];struct hlist_head ifinfo_list;struct batadv_orig_ifinfo *last_bonding_candidate;#ifdef CONFIG_BATMAN_ADV_DAT
Signature · 1 line
2.2.1
PATCH 4/15 batman-adv: kernel doc fixes for bridge_loop_avoidance.c
In reply to a message not in the archiveFrom: Martin Hundebøll <[email protected]>
Signed-off-by Martin Hundebøll <[email protected]>
Acked-by Simon Wunderlich <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/bridge_loop_avoidance.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/batman-adv/bridge_loop_avoidance.c +5 -1
@@ -252,7 +252,7 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw)/** * batadv_bla_send_claim - sends a claim frame according to the provided info * @bat_priv: the bat priv with all the soft interface information -* @orig: the mac address to be announced within the claim +* @mac: the mac address to be announced within the claim * @vid: the VLAN ID * @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...) */
@@ -364,6 +364,7 @@ out:* @bat_priv: the bat priv with all the soft interface information * @orig: the mac address of the originator * @vid: the VLAN ID +* @own_backbone: set if the requested backbone is local * * searches for the backbone gw or creates a new one if it could not * be found.
@@ -454,6 +455,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv,/** * batadv_bla_answer_request - answer a bla request by sending own claims * @bat_priv: the bat priv with all the soft interface information +* @primary_if: interface where the request came on * @vid: the vid where the request came on * * Repeat all of our own claims, and finally send an ANNOUNCE frame
@@ -775,6 +777,7 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv,/** * batadv_check_claim_group * @bat_priv: the bat priv with all the soft interface information +* @primary_if: the primary interface of this batman interface * @hw_src: the Hardware source in the ARP Header * @hw_dst: the Hardware destination in the ARP Header * @ethhdr: pointer to the Ethernet header of the claim frame
@@ -850,6 +853,7 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv,/** * batadv_bla_process_claim * @bat_priv: the bat priv with all the soft interface information +* @primary_if: the primary hard interface of this batman soft interface * @skb: the frame to be checked * * Check if this is a claim frame, and process it accordingly.
Signature · 1 line
2.2.1
PATCH 6/15 batman-adv: kernel doc fixes for main.{c, h}
In reply to a message not in the archiveFrom: Martin Hundebøll <[email protected]>
Signed-off-by Martin Hundebøll <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/main.c | 4 ++-- net/batman-adv/main.h | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-)
net/batman-adv/main.c +2 -2
@@ -651,7 +651,7 @@ static struct batadv_tvlv_handler/** * batadv_tvlv_container_free_ref - decrement the tvlv container refcounter and * possibly free it -* @tvlv_handler: the tvlv container to free +* @tvlv: the tvlv container to free */ static void batadv_tvlv_container_free_ref (struct batadv_tvlv_container *tvlv) {
@@ -800,7 +800,7 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv,* requested packet size * @packet_buff: packet buffer * @packet_buff_len: packet buffer size -* @packet_min_len: requested packet minimum size +* @min_packet_len: requested packet minimum size * @additional_packet_len: requested additional packet size on top of minimum * size *
net/batman-adv/main.h +2 -3
@@ -92,9 +92,8 @@/* numbers of originator to contact for any PUT/GET DHT operation */ #define BATADV_DAT_CANDIDATES_NUM 3 -/** -* BATADV_TQ_SIMILARITY_THRESHOLD - TQ points that a secondary metric can differ -* at most from the primary one in order to be still considered acceptable +/* BATADV_TQ_SIMILARITY_THRESHOLD - TQ points that a secondary metric can differ +* at most from the primary one in order to be still considered acceptable */ #define BATADV_TQ_SIMILARITY_THRESHOLD 50
Signature · 1 line
2.2.1
PATCH 14/15 batman-adv: Start new development cycle
In reply to a message not in the archiveFrom: Simon Wunderlich <[email protected]>
Signed-off-by Simon Wunderlich <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/main.h +1 -1
@@ -24,7 +24,7 @@#define BATADV_DRIVER_DEVICE "batman-adv"#ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2014.4.0" +#define BATADV_SOURCE_VERSION "2015.0"#endif /* B.A.T.M.A.N. parameters */
Signature · 1 line
2.2.1
PATCH 15/15 batman-adv: Kconfig, Add missing DEBUG_FS dependency
In reply to a message not in the archiveFrom: Markus Pargmann <[email protected]>
BATMAN_ADV_DEBUG is using debugfs files for the debugging log. So it depends on DEBUG_FS which is missing as dependency in the Kconfig file.
Signed-off-by Markus Pargmann <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/Kconfig | 1 + 1 file changed, 1 insertion(+)
net/batman-adv/Kconfig +1 -0
@@ -62,6 +62,7 @@ config BATMAN_ADV_MCAST config BATMAN_ADV_DEBUG bool "B.A.T.M.A.N. debugging" depends on BATMAN_ADV + depends on DEBUG_FS help This is an option for use by developers; most people should say N here. This enables compilation of support for
Signature · 1 line
2.2.1
PATCH 3/15 batman-adv: kernel doc fixes for bat_iv_ogm.c
In reply to Antonio QuartulliFrom: Martin Hundebøll <[email protected]>
Signed-off-by Martin Hundebøll <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/bat_iv_ogm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/batman-adv/bat_iv_ogm.c +5 -4
@@ -28,7 +28,7 @@/** -* batadv_dup_status - duplicate status +* enum batadv_dup_status - duplicate status * @BATADV_NO_DUP: the packet is a duplicate * @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the * neighbor)
@@ -517,7 +517,7 @@ out:* @bat_priv: the bat priv with all the soft interface information * @packet_len: (total) length of the OGM * @send_time: timestamp (jiffies) when the packet is to be sent -* @direktlink: true if this is a direct link packet +* @directlink: true if this is a direct link packet * @if_incoming: interface where the packet was received * @if_outgoing: interface for which the retransmission should be considered * @forw_packet: the forwarded packet which should be checked
@@ -1366,6 +1366,7 @@ out:/** * batadv_iv_ogm_process_per_outif - process a batman iv OGM for an outgoing if * @skb: the skb containing the OGM +* @ogm_offset: offset from skb->data to start of ogm header * @orig_node: the (cached) orig node for the originator of this OGM * @if_incoming: the interface where this packet was received * @if_outgoing: the interface for which the packet should be considered
@@ -1902,10 +1903,10 @@ out:* batadv_iv_ogm_neigh_is_eob - check if neigh1 is equally good or better than * neigh2 from the metric prospective * @neigh1: the first neighbor object of the comparison -* @if_outgoing: outgoing interface for the first neighbor +* @if_outgoing1: outgoing interface for the first neighbor * @neigh2: the second neighbor object of the comparison * @if_outgoing2: outgoing interface for the second neighbor - +* * Returns true if the metric via neigh1 is equally good or better than * the metric via neigh2, false otherwise. */
Signature · 1 line
2.2.1
PATCH 5/15 batman-adv: kernel doc fix for distributed-arp-table.h
In reply to Antonio QuartulliFrom: Martin Hundebøll <[email protected]>
Signed-off-by Martin Hundebøll <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/distributed-arp-table.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/batman-adv/distributed-arp-table.h +1 -3
@@ -25,9 +25,7 @@#include <linux/if_arp.h> -/** -* BATADV_DAT_ADDR_MAX - maximum address value in the DHT space -*/ +/* BATADV_DAT_ADDR_MAX - maximum address value in the DHT space */ #define BATADV_DAT_ADDR_MAX ((batadv_dat_addr_t)~(batadv_dat_addr_t)0)void batadv_dat_status_update (struct net_device *net_dev);
Signature · 1 line
2.2.1
PATCH 7/15 batman-adv: checkpatch - else is not generally useful after a break or return
In reply to Antonio QuartulliSigned-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/bitarray.h | 3 +-- net/batman-adv/fragmentation.h | 3 +-- net/batman-adv/network-coding.c | 3 +-- net/batman-adv/translation-table.c | 5 ++--- 4 files changed, 5 insertions(+), 9 deletions(-)
net/batman-adv/bitarray.h +1 -2
@@ -29,8 +29,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits, diff = last_seqno - curr_seqno;if (diff <0 || diff >=BATADV_TQ_LOCAL_WINDOW_SIZE )return 0 ; -else -return test_bit (diff, seq_bits) !=0 ; +return test_bit (diff, seq_bits) !=0 ; }/* turn corresponding bit on, so we can remember that we got the packet */
net/batman-adv/fragmentation.h +1 -2
@@ -41,8 +41,7 @@ batadv_frag_check_entry(struct batadv_frag_table_entry *frags_entry)if (!hlist_empty (&frags_entry->head) &&batadv_has_timed_out (frags_entry->timestamp,BATADV_FRAG_TIMEOUT ))return true; -else - return false; + return false; }#endif /* _NET_BATMAN_ADV_FRAGMENTATION_H_ */
net/batman-adv/network-coding.c +1 -2
@@ -1212,8 +1212,7 @@ static bool batadv_nc_skb_coding_possible(struct sk_buff *skb, {if (BATADV_SKB_CB (skb)->decoded && !batadv_compare_eth (dst, src))return false; -else -return true; +return true; }/**
net/batman-adv/translation-table.c +2 -3
@@ -2769,9 +2769,8 @@ static bool batadv_send_tt_response(struct batadv_priv *bat_priv, {if (batadv_is_my_mac (bat_priv, req_dst))return batadv_send_my_tt_response (bat_priv, tt_data, req_src); -else -return batadv_send_other_tt_response (bat_priv, tt_data, - req_src, req_dst); +return batadv_send_other_tt_response (bat_priv, tt_data, req_src, + req_dst); } static void _batadv_tt_update_changes(struct batadv_priv *bat_priv,
Signature · 1 line
2.2.1
PATCH 8/15 batman-adv: checkpatch - No space is necessary after a cast
In reply to Antonio QuartulliSigned-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/main.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/batman-adv/main.h +4 -4
@@ -312,10 +312,10 @@ static inline bool batadv_has_timed_out(unsigned long timestamp,* - when adding 128 - it is neither a predecessor nor a successor, * - after adding more than 127 to the starting value - it is a successor */ -#define batadv_seq_before (x, y) ({typeof(x) _d1 = (x); \ - typeof(y) _d2 = (y); \ - typeof(x) _dummy = (_d1 - _d2); \ - (void) (&_d1 == &_d2); \ +#define batadv_seq_before (x, y) ({typeof(x)_d1 = (x); \ + typeof(y)_d2 = (y); \ + typeof(x)_dummy = (_d1 - _d2); \ + (void)(&_d1 == &_d2); \ _dummy > batadv_smallest_signed_int(_dummy); })#define batadv_seq_after (x, y) batadv_seq_before(y, x)
Signature · 1 line
2.2.1
PATCH 9/15 batman-adv: checkpatch - Please use a blank line after declarations
In reply to Antonio QuartulliSigned-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/debugfs.c | 1 + net/batman-adv/distributed-arp-table.c | 1 + net/batman-adv/gateway_client.c | 1 + net/batman-adv/packet.h | 1 + 4 files changed, 4 insertions(+)
net/batman-adv/debugfs.c +1 -0
@@ -404,6 +404,7 @@ struct batadv_debuginfo batadv_hardif_debuginfo_##_name = { \ .release = single_release, \ }, \ } + static BATADV_HARDIF_DEBUGINFO(originators, S_IRUGO, batadv_originators_hardif_open);
net/batman-adv/distributed-arp-table.c +1 -0
@@ -1100,6 +1100,7 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv,batadv_dat_send_data (bat_priv, skb, ip_src,BATADV_P_DAT_DHT_PUT );batadv_dat_send_data (bat_priv, skb, ip_dst,BATADV_P_DAT_DHT_PUT ); } +/** * batadv_dat_snoop_incoming_arp_reply - snoop the ARP reply and fill the local * DAT storage only
net/batman-adv/gateway_client.c +1 -0
@@ -775,6 +775,7 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,return ret; } +/** * batadv_gw_out_of_range - check if the dhcp request destination is the best gw * @bat_priv: the bat priv with all the soft interface information
net/batman-adv/packet.h +1 -0
@@ -198,6 +198,7 @@ struct batadv_bla_claim_dst {uint8_t type;/* bla_claimframe */ __be16 group;/* group id */ }; +#pragma pack()/**
Signature · 1 line
2.2.1
PATCH 10/15 batman-adv: checkpatch - Please don't use multiple blank lines
In reply to Antonio QuartulliSigned-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/bat_iv_ogm.c | 2 -- net/batman-adv/bitarray.c | 1 - net/batman-adv/bridge_loop_avoidance.c | 7 ------- net/batman-adv/fragmentation.c | 1 - net/batman-adv/main.c | 1 - net/batman-adv/originator.c | 1 - net/batman-adv/originator.h | 1 - net/batman-adv/routing.c | 1 - net/batman-adv/soft-interface.c | 1 - net/batman-adv/sysfs.c | 1 - net/batman-adv/translation-table.c | 1 - 11 files changed, 18 deletions(-)
net/batman-adv/bat_iv_ogm.c +0 -2
@@ -26,7 +26,6 @@#include "bat_algo.h" #include "network-coding.h" -/** * enum batadv_dup_status - duplicate status * @BATADV_NO_DUP: the packet is a duplicate
@@ -1362,7 +1361,6 @@ out:return ret; } -/** * batadv_iv_ogm_process_per_outif - process a batman iv OGM for an outgoing if * @skb: the skb containing the OGM
net/batman-adv/bitarray.c +0 -1
@@ -29,7 +29,6 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n)bitmap_shift_left (seq_bits, seq_bits, n,BATADV_TQ_LOCAL_WINDOW_SIZE ); } -/* receive and process one packet within the sequence number window. * * returns:
net/batman-adv/bridge_loop_avoidance.c +0 -7
@@ -69,7 +69,6 @@ static inline uint32_t batadv_choose_backbone_gw(const void *data,return hash % size; } -/* compares address and vid of two backbone gws */ static int batadv_compare_backbone_gw (const struct hlist_node *node,const void *data2)
@@ -662,7 +661,6 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv,if (unlikely (!backbone_gw))return 1 ; -/* handle as ANNOUNCE frame */ backbone_gw->lasttime = jiffies; crc =ntohs (*((__be16 *)(&an_addr[4 ])));
@@ -849,7 +847,6 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv,return 2 ; } -/** * batadv_bla_process_claim * @bat_priv: the bat priv with all the soft interface information
@@ -1347,8 +1344,6 @@ out:return ret; } - -/** * batadv_bla_is_backbone_gw_orig * @bat_priv: the bat priv with all the soft interface information
@@ -1390,7 +1385,6 @@ bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig,return false; } -/** * batadv_bla_is_backbone_gw * @skb: the frame to be checked
@@ -1480,7 +1474,6 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,if (!atomic_read (&bat_priv->bridge_loop_avoidance)) goto allow; -if (unlikely (atomic_read (&bat_priv->bla.num_requests)))/* don't allow broadcasts while requests are in flight */ if (is_multicast_ether_addr (ethhdr->h_dest) && is_bcast)
net/batman-adv/fragmentation.c +0 -1
@@ -23,7 +23,6 @@#include "hard-interface.h" #include "soft-interface.h" -/** * batadv_frag_clear_chain - delete entries in the fragment buffer chain * @head: head of chain with entries.
net/batman-adv/main.c +0 -1
@@ -41,7 +41,6 @@#include "network-coding.h" #include "fragmentation.h" -/* List manipulations on hardif_list have to be rtnl_lock()'ed, * list traversals just rcu-locked */
net/batman-adv/originator.c +0 -1
@@ -797,7 +797,6 @@ batadv_purge_orig_ifinfo(struct batadv_priv *bat_priv,return ifinfo_purged; } -/** * batadv_purge_orig_neighbors - purges neighbors from originator * @bat_priv: the bat priv with all the soft interface information
net/batman-adv/originator.h +0 -1
@@ -70,7 +70,6 @@ batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node, unsigned short vid);void batadv_orig_node_vlan_free_ref (struct batadv_orig_node_vlan *orig_vlan); -/* hashfunction to choose an entry in a hash table of given size * hash algorithm from http://en.wikipedia.org/wiki/Hash_table */
net/batman-adv/routing.c +0 -1
@@ -292,7 +292,6 @@ out:return ret; } -int batadv_recv_icmp_packet (struct sk_buff *skb,struct batadv_hard_iface *recv_if) {
net/batman-adv/soft-interface.c +0 -1
@@ -36,7 +36,6 @@#include "bridge_loop_avoidance.h" #include "network-coding.h" -static int batadv_get_settings (struct net_device *dev,struct ethtool_cmd *cmd);static void batadv_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info);
net/batman-adv/sysfs.c +0 -1
@@ -151,7 +151,6 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ batadv_store_##_name) - #define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ ssize_t batadv_store_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff, \
net/batman-adv/translation-table.c +0 -1
@@ -1780,7 +1780,6 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv,batadv_tt_global_del_roaming (bat_priv, tt_global_entry, orig_node, message); - out:if (tt_global_entry)batadv_tt_global_entry_free_ref (tt_global_entry);
Signature · 1 line
2.2.1
PATCH 11/15 batman-adv: checkpatch - remove unnecessary parentheses
In reply to Antonio QuartulliSigned-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/bat_iv_ogm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/batman-adv/bat_iv_ogm.c +2 -2
@@ -878,7 +878,7 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface)hlist_for_each_entry_rcu (orig_node, head, hash_entry) {spin_lock_bh (&orig_node->bat_iv.ogm_cnt_lock); word_index = hard_iface->if_num *BATADV_NUM_WORDS ; - word = &(orig_node->bat_iv.bcast_own[word_index]); + word = &orig_node->bat_iv.bcast_own[word_index];batadv_bit_get_packet (bat_priv, word,1 ,0 ); if_num = hard_iface->if_num;
@@ -1663,7 +1663,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, offset = if_num *BATADV_NUM_WORDS ;spin_lock_bh (&orig_neigh_node->bat_iv.ogm_cnt_lock); - word = &(orig_neigh_node->bat_iv.bcast_own[offset]); + word = &orig_neigh_node->bat_iv.bcast_own[offset]; bit_pos = if_incoming_seqno -2 ; bit_pos -=ntohl (ogm_packet->seqno);batadv_set_bit (word, bit_pos);
Signature · 1 line
2.2.1
PATCH 12/15 batman-adv: clear control block of received socket buffers
In reply to Antonio QuartulliFrom: Martin Hundebøll <[email protected]>
Since other network components (and some drivers) uses the control block provided in skb's, the network coding feature might wrongly assume that an SKB has been decoded, and thus not try to code it with another packet again. This happens for instance when batman-adv is running on a bridge device.
Fix this by clearing the control block for every received SKB.
Introduced by 3c12de9a5c756b23fe7c9ab332474ece1568914c ("batman-adv: network coding - code and transmit packets if possible")
Signed-off-by Martin Hundebøll <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/main.c | 3 +++ 1 file changed, 3 insertions(+)
net/batman-adv/main.c +3 -0
@@ -402,6 +402,9 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, goto err_free; } +/* reset control block to avoid left overs from previous users */ +memset (skb->cb,0 ,sizeof (struct batadv_skb_cb )); +/* all receive handlers return whether they received or reused * the supplied skb. if not, we have to free the skb. */
Signature · 1 line
2.2.1
PATCH 13/15 batman-adv: fix misspelled words
In reply to Antonio QuartulliReported-by checkpatch
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/bridge_loop_avoidance.c | 4 ++-- net/batman-adv/main.c | 2 +- net/batman-adv/packet.h | 4 ++-- net/batman-adv/routing.c | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/types.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
net/batman-adv/bridge_loop_avoidance.c +2 -2
@@ -244,7 +244,7 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw)spin_unlock_bh (list_lock); } -/* all claims gone, intialize CRC */ +/* all claims gone, initialize CRC */ backbone_gw->crc =BATADV_BLA_CRC_INIT ; }
@@ -1328,7 +1328,7 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, goto out; }/* not found, add a new entry (overwrite the oldest entry) -* and allow it, its the first occurence. +* and allow it, its the first occurrence. */ curr = (bat_priv->bla.bcast_duplist_curr +BATADV_DUPLIST_SIZE -1 ); curr %=BATADV_DUPLIST_SIZE ;
net/batman-adv/main.c +1 -1
@@ -798,7 +798,7 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv, }/** -* batadv_tvlv_realloc_packet_buff - reallocate packet buffer to accomodate +* batadv_tvlv_realloc_packet_buff - reallocate packet buffer to accommodate * requested packet size * @packet_buff: packet buffer * @packet_buff_len: packet buffer size
net/batman-adv/packet.h +2 -2
@@ -377,7 +377,7 @@ struct batadv_frag_packet { uint8_t reserved:4; uint8_t no:4;#else -#error "unknown bitfield endianess" +#error "unknown bitfield endianness"#endif uint8_t dest[ETH_ALEN ];uint8_t orig[ETH_ALEN ];
@@ -453,7 +453,7 @@ struct batadv_coded_packet {* @src: address of the source * @dst: address of the destination * @tvlv_len: length of tvlv data following the unicast tvlv header -* @align: 2 bytes to align the header to a 4 byte boundry +* @align: 2 bytes to align the header to a 4 byte boundary */ struct batadv_unicast_tvlv_packet {uint8_t packet_type;
net/batman-adv/routing.c +1 -1
@@ -456,7 +456,7 @@ batadv_find_router(struct batadv_priv *bat_priv,* the last chosen bonding candidate (next_candidate). If no such * router is found, use the first candidate found (the previously * chosen bonding candidate might have been the last one in the list). -* If this can't be found either, return the previously choosen +* If this can't be found either, return the previously chosen * router - obviously there are no other candidates. */ rcu_read_lock ();
net/batman-adv/translation-table.c +1 -1
@@ -2852,7 +2852,7 @@ static void batadv_tt_update_changes(struct batadv_priv *bat_priv,/** * batadv_is_my_client - check if a client is served by the local node * @bat_priv: the bat priv with all the soft interface information -* @addr: the mac adress of the client to check +* @addr: the mac address of the client to check * @vid: VLAN identifier * * Returns true if the client is served by this node, false otherwise.
net/batman-adv/types.h +1 -1
@@ -968,7 +968,7 @@ struct batadv_tt_orig_list_entry { };/** -* struct batadv_tt_change_node - structure for tt changes occured +* struct batadv_tt_change_node - structure for tt changes occurred * @list: list node for batadv_priv_tt::changes_list * @change: holds the actual translation table diff data */
Signature · 1 line
2.2.1
David Miller
maintainerFrom: Antonio Quartulli <[email protected]>
Date: Thu, 8 Jan 2015 16:15:05 +0100
Quoted 9 lines
this is a batch of patches intended for net-next.
In this patchset you have mostly cleanups and small corrections to issues reported by checkpatch.
One notable change is the addition of the
DEBUG_FSdependency to theBATMAN_ADV_DEBUGsymbol by Markus Pargmann. We add this dependency because all the information provided by the DEBUG feature is accessible only through debugfs.
Pulled, thanks Antonio.