linux-merge June 2015

linux-merge@lists.open-mesh.org

3 participants
69 discussions

Build check errors found: 2015-06-10
by postmaster＠open-mesh.org 09 Jun '15

09 Jun '15

Name of failed tests ==================== * checkpatch next ./net/batman-adv/icmp_socket.c * checkpatch next ./net/batman-adv/network-coding.c * difference between net-next and batadv next Output of different failed tests ================================ checkpatch next ./net/batman-adv/icmp_socket.c ---------------------------------------------- WARNING: line over 80 characters #340: FILE: ./net/batman-adv/icmp_socket.c:340: + * batadv_socket_receive_packet - schedule an icmp packet to be sent to userspace total: 0 errors, 1 warnings, 0 checks, 410 lines checked checkpatch next ./net/batman-adv/network-coding.c ------------------------------------------------- WARNING: line over 80 characters #875: FILE: ./net/batman-adv/network-coding.c:875: + * batadv_nc_update_nc_node - updates stored incoming and outgoing nc node structs total: 0 errors, 1 warnings, 0 checks, 1959 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 44 +---------- net/batman-adv/bitarray.c | 4 - net/batman-adv/bitarray.h | 6 - net/batman-adv/bridge_loop_avoidance.c | 54 +++++--------- net/batman-adv/bridge_loop_avoidance.h | 10 -- net/batman-adv/debugfs.c | 37 ++------- net/batman-adv/debugfs.h | 7 - net/batman-adv/distributed-arp-table.c | 63 +++------------- net/batman-adv/distributed-arp-table.h | 13 --- net/batman-adv/fragmentation.c | 22 ----- net/batman-adv/fragmentation.h | 9 -- net/batman-adv/gateway_client.c | 41 +++-------- net/batman-adv/gateway_client.h | 8 -- net/batman-adv/gateway_common.c | 11 -- net/batman-adv/gateway_common.h | 7 - net/batman-adv/hard-interface.c | 38 +++------- net/batman-adv/hard-interface.h | 11 -- net/batman-adv/hash.c | 6 - net/batman-adv/hash.h | 31 +++++--- net/batman-adv/icmp_socket.c | 33 +------- net/batman-adv/icmp_socket.h | 7 - net/batman-adv/main.c | 56 ++++----------- net/batman-adv/main.h | 30 ++++---- net/batman-adv/multicast.c | 29 ------- net/batman-adv/multicast.h | 6 - net/batman-adv/network-coding.c | 47 +++--------- net/batman-adv/network-coding.h | 13 --- net/batman-adv/originator.c | 34 ++------- net/batman-adv/originator.h | 26 +++---- net/batman-adv/packet.h | 3 net/batman-adv/routing.c | 36 ++------- net/batman-adv/routing.h | 10 -- net/batman-adv/send.c | 36 ++------- net/batman-adv/send.h | 13 --- net/batman-adv/soft-interface.c | 66 ++++------------- net/batman-adv/soft-interface.h | 11 -- net/batman-adv/sysfs.c | 60 +++++----------- net/batman-adv/sysfs.h | 10 -- net/batman-adv/translation-table.c | 89 +++++++++--------------- net/batman-adv/translation-table.h | 9 -- net/batman-adv/types.h | 22 ----- 41 files changed, 270 insertions(+), 798 deletions(-)

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 09 Jun '15

09 Jun '15

--- batman-adv_master.packet.h 2015-06-10 00:15:01.694683914 +0200 +++ batctl_master.packet.h 2015-06-10 00:15:01.706684716 +0200 @@ -197,8 +197,8 @@ * transport the claim type and the group id */ struct batadv_bla_claim_dst { - u8 magic[3]; /* FF:43:05 */ - u8 type; /* bla_claimframe */ + uint8_t magic[3]; /* FF:43:05 */ + uint8_t type; /* bla_claimframe */ __be16 group; /* group id */ }; @@ -213,16 +213,16 @@ * @tvlv_len: length of tvlv data following the ogm header */ struct batadv_ogm_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 flags; - __be32 seqno; - u8 orig[ETH_ALEN]; - u8 prev_sender[ETH_ALEN]; - u8 reserved; - u8 tq; - __be16 tvlv_len; + uint8_t packet_type; + uint8_t version; + uint8_t ttl; + uint8_t flags; + __be32 seqno; + uint8_t orig[ETH_ALEN]; + uint8_t prev_sender[ETH_ALEN]; + uint8_t reserved; + uint8_t tq; + __be16 tvlv_len; /* __packed is not needed as the struct size is divisible by 4, * and the largest data type in this struct has a size of 4. */ @@ -246,14 +246,14 @@ * members are padded the same way as they are in real packets. */ struct batadv_icmp_header { - u8 packet_type; - u8 version; - u8 ttl; - u8 msg_type; /* see ICMP message types above */ - u8 dst[ETH_ALEN]; - u8 orig[ETH_ALEN]; - u8 uid; - u8 align[3]; + uint8_t packet_type; + uint8_t version; + uint8_t ttl; + uint8_t msg_type; /* see ICMP message types above */ + uint8_t dst[ETH_ALEN]; + uint8_t orig[ETH_ALEN]; + uint8_t uid; + uint8_t align[3]; }; /** @@ -269,15 +269,15 @@ * @seqno: ICMP sequence number */ struct batadv_icmp_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 msg_type; /* see ICMP message types above */ - u8 dst[ETH_ALEN]; - u8 orig[ETH_ALEN]; - u8 uid; - u8 reserved; - __be16 seqno; + uint8_t packet_type; + uint8_t version; + uint8_t ttl; + uint8_t msg_type; /* see ICMP message types above */ + uint8_t dst[ETH_ALEN]; + uint8_t orig[ETH_ALEN]; + uint8_t uid; + uint8_t reserved; + __be16 seqno; }; #define BATADV_RR_LEN 16 @@ -296,16 +296,16 @@ * @rr: route record array */ struct batadv_icmp_packet_rr { - u8 packet_type; - u8 version; - u8 ttl; - u8 msg_type; /* see ICMP message types above */ - u8 dst[ETH_ALEN]; - u8 orig[ETH_ALEN]; - u8 uid; - u8 rr_cur; - __be16 seqno; - u8 rr[BATADV_RR_LEN][ETH_ALEN]; + uint8_t packet_type; + uint8_t version; + uint8_t ttl; + uint8_t msg_type; /* see ICMP message types above */ + uint8_t dst[ETH_ALEN]; + uint8_t orig[ETH_ALEN]; + uint8_t uid; + uint8_t rr_cur; + __be16 seqno; + uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; }; #define BATADV_ICMP_MAX_PACKET_SIZE sizeof(struct batadv_icmp_packet_rr) @@ -331,11 +331,11 @@ * @dest: originator destination of the unicast packet */ struct batadv_unicast_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 ttvn; /* destination translation table version number */ - u8 dest[ETH_ALEN]; + uint8_t packet_type; + uint8_t version; + uint8_t ttl; + uint8_t ttvn; /* destination translation table version number */ + uint8_t dest[ETH_ALEN]; /* "4 bytes boundary + 2 bytes" long to make the payload after the * following ethernet header again 4 bytes boundary aligned */ @@ -349,9 +349,9 @@ */ struct batadv_unicast_4addr_packet { struct batadv_unicast_packet u; - u8 src[ETH_ALEN]; - u8 subtype; - u8 reserved; + uint8_t src[ETH_ALEN]; + uint8_t subtype; + uint8_t reserved; /* "4 bytes boundary + 2 bytes" long to make the payload after the * following ethernet header again 4 bytes boundary aligned */ @@ -370,22 +370,22 @@ * @total_size: size of the merged packet */ struct batadv_frag_packet { - u8 packet_type; - u8 version; /* batman version field */ - u8 ttl; + uint8_t packet_type; + uint8_t version; /* batman version field */ + uint8_t ttl; #if defined(__BIG_ENDIAN_BITFIELD) - u8 no:4; - u8 reserved:4; + uint8_t no:4; + uint8_t reserved:4; #elif defined(__LITTLE_ENDIAN_BITFIELD) - u8 reserved:4; - u8 no:4; + uint8_t reserved:4; + uint8_t no:4; #else #error "unknown bitfield endianness" #endif - u8 dest[ETH_ALEN]; - u8 orig[ETH_ALEN]; - __be16 seqno; - __be16 total_size; + uint8_t dest[ETH_ALEN]; + uint8_t orig[ETH_ALEN]; + __be16 seqno; + __be16 total_size; }; /** @@ -398,12 +398,12 @@ * @orig: originator of the broadcast packet */ struct batadv_bcast_packet { - u8 packet_type; - u8 version; /* batman version field */ - u8 ttl; - u8 reserved; - __be32 seqno; - u8 orig[ETH_ALEN]; + uint8_t packet_type; + uint8_t version; /* batman version field */ + uint8_t ttl; + uint8_t reserved; + __be32 seqno; + uint8_t orig[ETH_ALEN]; /* "4 bytes boundary + 2 bytes" long to make the payload after the * following ethernet header again 4 bytes boundary aligned */ @@ -428,21 +428,21 @@ * @coded_len: length of network coded part of the payload */ struct batadv_coded_packet { - u8 packet_type; - u8 version; /* batman version field */ - u8 ttl; - u8 first_ttvn; - /* u8 first_dest[ETH_ALEN]; - saved in mac header destination */ - u8 first_source[ETH_ALEN]; - u8 first_orig_dest[ETH_ALEN]; - __be32 first_crc; - u8 second_ttl; - u8 second_ttvn; - u8 second_dest[ETH_ALEN]; - u8 second_source[ETH_ALEN]; - u8 second_orig_dest[ETH_ALEN]; - __be32 second_crc; - __be16 coded_len; + uint8_t packet_type; + uint8_t version; /* batman version field */ + uint8_t ttl; + uint8_t first_ttvn; + /* uint8_t first_dest[ETH_ALEN]; - saved in mac header destination */ + uint8_t first_source[ETH_ALEN]; + uint8_t first_orig_dest[ETH_ALEN]; + __be32 first_crc; + uint8_t second_ttl; + uint8_t second_ttvn; + uint8_t second_dest[ETH_ALEN]; + uint8_t second_source[ETH_ALEN]; + uint8_t second_orig_dest[ETH_ALEN]; + __be32 second_crc; + __be16 coded_len; }; #pragma pack() @@ -459,14 +459,14 @@ * @align: 2 bytes to align the header to a 4 byte boundary */ struct batadv_unicast_tvlv_packet { - u8 packet_type; - u8 version; /* batman version field */ - u8 ttl; - u8 reserved; - u8 dst[ETH_ALEN]; - u8 src[ETH_ALEN]; - __be16 tvlv_len; - u16 align; + uint8_t packet_type; + uint8_t version; /* batman version field */ + uint8_t ttl; + uint8_t reserved; + uint8_t dst[ETH_ALEN]; + uint8_t src[ETH_ALEN]; + __be16 tvlv_len; + uint16_t align; }; /** @@ -476,9 +476,9 @@ * @len: tvlv container length */ struct batadv_tvlv_hdr { - u8 type; - u8 version; - __be16 len; + uint8_t type; + uint8_t version; + __be16 len; }; /** @@ -500,9 +500,9 @@ * one batadv_tvlv_tt_vlan_data object per announced vlan */ struct batadv_tvlv_tt_data { - u8 flags; - u8 ttvn; - __be16 num_vlan; + uint8_t flags; + uint8_t ttvn; + __be16 num_vlan; }; /** @@ -513,9 +513,9 @@ * @reserved: unused, useful for alignment purposes */ struct batadv_tvlv_tt_vlan_data { - __be32 crc; - __be16 vid; - u16 reserved; + __be32 crc; + __be16 vid; + uint16_t reserved; }; /** @@ -527,9 +527,9 @@ * @vid: VLAN identifier */ struct batadv_tvlv_tt_change { - u8 flags; - u8 reserved[3]; - u8 addr[ETH_ALEN]; + uint8_t flags; + uint8_t reserved[3]; + uint8_t addr[ETH_ALEN]; __be16 vid; }; @@ -539,7 +539,7 @@ * @vid: VLAN identifier */ struct batadv_tvlv_roam_adv { - u8 client[ETH_ALEN]; + uint8_t client[ETH_ALEN]; __be16 vid; }; @@ -549,8 +549,8 @@ * @reserved: reserved field */ struct batadv_tvlv_mcast_data { - u8 flags; - u8 reserved[3]; + uint8_t flags; + uint8_t reserved[3]; }; #endif /* _NET_BATMAN_ADV_PACKET_H_ */

1 0

Build check errors found: 2015-06-09
by postmaster＠open-mesh.org 08 Jun '15

08 Jun '15

Name of failed tests ==================== * checkpatch master ./net/batman-adv/icmp_socket.c * checkpatch master ./net/batman-adv/network-coding.c * checkpatch next ./net/batman-adv/icmp_socket.c * checkpatch next ./net/batman-adv/network-coding.c * difference between net-next and batadv next Output of different failed tests ================================ checkpatch next ./net/batman-adv/icmp_socket.c ---------------------------------------------- WARNING: line over 80 characters #340: FILE: ./net/batman-adv/icmp_socket.c:340: + * batadv_socket_receive_packet - schedule an icmp packet to be sent to userspace total: 0 errors, 1 warnings, 0 checks, 410 lines checked checkpatch next ./net/batman-adv/network-coding.c ------------------------------------------------- WARNING: line over 80 characters #875: FILE: ./net/batman-adv/network-coding.c:875: + * batadv_nc_update_nc_node - updates stored incoming and outgoing nc node structs total: 0 errors, 1 warnings, 0 checks, 1959 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 44 +---------- net/batman-adv/bitarray.c | 4 - net/batman-adv/bitarray.h | 6 - net/batman-adv/bridge_loop_avoidance.c | 54 +++++--------- net/batman-adv/bridge_loop_avoidance.h | 10 -- net/batman-adv/debugfs.c | 37 ++------- net/batman-adv/debugfs.h | 7 - net/batman-adv/distributed-arp-table.c | 45 +----------- net/batman-adv/distributed-arp-table.h | 13 --- net/batman-adv/fragmentation.c | 22 ----- net/batman-adv/fragmentation.h | 9 -- net/batman-adv/gateway_client.c | 39 +++------- net/batman-adv/gateway_client.h | 8 -- net/batman-adv/gateway_common.c | 11 -- net/batman-adv/gateway_common.h | 7 - net/batman-adv/hard-interface.c | 38 +++------- net/batman-adv/hard-interface.h | 11 -- net/batman-adv/hash.c | 6 - net/batman-adv/hash.h | 31 +++++--- net/batman-adv/icmp_socket.c | 33 +------- net/batman-adv/icmp_socket.h | 7 - net/batman-adv/main.c | 56 ++++----------- net/batman-adv/main.h | 30 ++++---- net/batman-adv/multicast.c | 29 ------- net/batman-adv/multicast.h | 6 - net/batman-adv/network-coding.c | 47 +++--------- net/batman-adv/network-coding.h | 13 --- net/batman-adv/originator.c | 34 ++------- net/batman-adv/originator.h | 26 +++---- net/batman-adv/packet.h | 3 net/batman-adv/routing.c | 36 ++------- net/batman-adv/routing.h | 10 -- net/batman-adv/send.c | 36 ++------- net/batman-adv/send.h | 13 --- net/batman-adv/soft-interface.c | 66 ++++------------- net/batman-adv/soft-interface.h | 11 -- net/batman-adv/sysfs.c | 60 +++++----------- net/batman-adv/sysfs.h | 10 -- net/batman-adv/translation-table.c | 89 +++++++++--------------- net/batman-adv/translation-table.h | 9 -- net/batman-adv/types.h | 22 ----- 41 files changed, 264 insertions(+), 784 deletions(-)

1 0

Build check errors found: 2015-06-08
by postmaster＠open-mesh.org 07 Jun '15

07 Jun '15

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150605
by batman＠open-mesh.org 07 Jun '15

07 Jun '15

The following commit has been merged in the master branch: commit e8ad3b1acfbb022b495f12f4ed6e825d5f53546a Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:38 2014 +0100 batman-adv: main, Convert is_my_mac() to bool It is much clearer to see a bool type as return value than 'int' for functions that are supposed to return true or false. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index fd9333d..a22247a 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -209,10 +209,13 @@ void batadv_mesh_free(struct net_device *soft_iface) * interfaces in the current mesh * @bat_priv: the bat priv with all the soft interface information * @addr: the address to check + * + * Returns 'true' if the mac address was found, false otherwise. */ -int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr) +bool batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr) { const struct batadv_hard_iface *hard_iface; + bool is_my_mac = false; rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { @@ -223,12 +226,12 @@ int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr) continue; if (batadv_compare_eth(hard_iface->net_dev->dev_addr, addr)) { - rcu_read_unlock(); - return 1; + is_my_mac = true; + break; } } rcu_read_unlock(); - return 0; + return is_my_mac; } /** diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 026ba37..96876d2 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -195,7 +195,7 @@ extern struct workqueue_struct *batadv_event_workqueue; int batadv_mesh_init(struct net_device *soft_iface); void batadv_mesh_free(struct net_device *soft_iface); -int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr); +bool batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_hard_iface * batadv_seq_print_text_primary_if_get(struct seq_file *seq); int batadv_max_header_len(void); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150605
by batman＠open-mesh.org 07 Jun '15

07 Jun '15

The following commit has been merged in the master branch: commit f2d5cf2add74ac066572b5215ba8a33dfcf0b85c Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:39 2014 +0100 batman-adv: main, batadv_compare_eth return bool Declare the returntype of batadv_compare_eth as bool. The function called inside this helper function (ether_addr_equal_unaligned) also uses bool as return value, so there is no need to return int. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 96876d2..af0a336 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -279,7 +279,7 @@ static inline void _batadv_dbg(int type __always_unused, * * note: can't use ether_addr_equal() as it requires aligned memory */ -static inline int batadv_compare_eth(const void *data1, const void *data2) +static inline bool batadv_compare_eth(const void *data1, const void *data2) { return ether_addr_equal_unaligned(data1, data2); } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150605
by batman＠open-mesh.org 07 Jun '15

07 Jun '15

The following commit has been merged in the master branch: commit 9fb6c6519b10aee4815591122ce59ce4b63fc44b Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:40 2014 +0100 batman-adv: Remove unnecessary ret variable We can avoid this indirect return variable by directly returning the error values. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index a22247a..49f07e1 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -513,14 +513,12 @@ static struct batadv_algo_ops *batadv_algo_get(char *name) int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) { struct batadv_algo_ops *bat_algo_ops_tmp; - int ret; bat_algo_ops_tmp = batadv_algo_get(bat_algo_ops->name); if (bat_algo_ops_tmp) { pr_info("Trying to register already registered routing algorithm: %s\n", bat_algo_ops->name); - ret = -EEXIST; - goto out; + return -EEXIST; } /* all algorithms must implement all ops (for now) */ @@ -534,16 +532,13 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) !bat_algo_ops->bat_neigh_is_equiv_or_better) { pr_info("Routing algo '%s' does not implement required ops\n", bat_algo_ops->name); - ret = -EINVAL; - goto out; + return -EINVAL; } INIT_HLIST_NODE(&bat_algo_ops->list); hlist_add_head(&bat_algo_ops->list, &batadv_algo_list); - ret = 0; -out: - return ret; + return 0; } int batadv_algo_select(struct batadv_priv *bat_priv, char *name) -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150605
by batman＠open-mesh.org 07 Jun '15

07 Jun '15

The following commit has been merged in the master branch: commit f372d09059a67f57b3d2b5eab8c05b0ddb8ca92f Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:41 2014 +0100 batman-adv: Remove unnecessary ret variable in algo_register Remove ret variable and all jumps. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 49f07e1..548e405 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -544,17 +544,14 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) int batadv_algo_select(struct batadv_priv *bat_priv, char *name) { struct batadv_algo_ops *bat_algo_ops; - int ret = -EINVAL; bat_algo_ops = batadv_algo_get(name); if (!bat_algo_ops) - goto out; + return -EINVAL; bat_priv->bat_algo_ops = bat_algo_ops; - ret = 0; -out: - return ret; + return 0; } int batadv_algo_seq_print_text(struct seq_file *seq, void *offset) -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150605
by batman＠open-mesh.org 07 Jun '15

07 Jun '15

The following commit has been merged in the master branch: commit d491dbb68b6efd12a27ee10791e27fc5f2bd02ff Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:36 2014 +0100 batman-adv: iv_ogm, fix comment function name This is a small copy paste fix for batadv_ing_buffer_avg. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 0019f1b..9f83137 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -55,7 +55,7 @@ static void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, } /** - * batadv_ring_buffer_set - compute the average of all non-zero values stored + * batadv_ring_buffer_avg - compute the average of all non-zero values stored * in the given ring buffer * @lq_recv: pointer to the ring buffer * -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150605
by batman＠open-mesh.org 07 Jun '15

07 Jun '15

The following commit has been merged in the master branch: commit 21102626da60a6fcb0458e4040ee4739f04652e8 Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:37 2014 +0100 batman-adv: types, Fix comment on bcast_own batadv_orig_bat_iv->bcast_own is actually not a bitfield, it is an array. Adjust the comment accordingly. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index e95db42..c1000c0 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -183,9 +183,10 @@ struct batadv_orig_node_vlan { /** * struct batadv_orig_bat_iv - B.A.T.M.A.N. IV private orig_node members - * @bcast_own: bitfield containing the number of our OGMs this orig_node - * rebroadcasted "back" to us (relative to last_real_seqno) - * @bcast_own_sum: counted result of bcast_own + * @bcast_own: set of bitfields (one per hard interface) where each one counts + * the number of our OGMs this orig_node rebroadcasted "back" to us (relative + * to last_real_seqno). Every bitfield is BATADV_TQ_LOCAL_WINDOW_SIZE bits long. + * @bcast_own_sum: sum of bcast_own * @ogm_cnt_lock: lock protecting bcast_own, bcast_own_sum, * neigh_node->bat_iv.real_bits & neigh_node->bat_iv.real_packet_count */ -- LinuxNextTracking

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge June 2015