[batman-adv] master: batman-adv: iv_ogm, fix coding style (63c15a5)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 63c15a585d0b95bc86748550d706f5ee64253331
Author: Markus Pargmann <mpa(a)pengutronix.de>
Date: Fri Dec 26 12:41:35 2014 +0100
batman-adv: iv_ogm, fix coding style
The kernel coding style says, that there should not be multiple
assignments in one row.
Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
63c15a585d0b95bc86748550d706f5ee64253331
bat_iv_ogm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 139377e..b920656 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -64,7 +64,9 @@ static void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index,
static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[])
{
const uint8_t *ptr;
- uint16_t count = 0, i = 0, sum = 0;
+ uint16_t count = 0;
+ uint16_t i = 0;
+ uint16_t sum = 0;
ptr = lq_recv;
7 years, 11 months
[batman-adv] master: batman-adv: iv_ogm, Fix dup_status comment (d00159a)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit d00159aec639311d51fe4cba8c483ab55a0191d4
Author: Markus Pargmann <mpa(a)pengutronix.de>
Date: Fri Dec 26 12:41:34 2014 +0100
batman-adv: iv_ogm, Fix dup_status comment
Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
d00159aec639311d51fe4cba8c483ab55a0191d4
bat_iv_ogm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 7d4f6bf..139377e 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -28,7 +28,7 @@
/**
* enum batadv_dup_status - duplicate status
- * @BATADV_NO_DUP: the packet is a duplicate
+ * @BATADV_NO_DUP: the packet is no duplicate
* @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the
* neighbor)
* @BATADV_NEIGH_DUP: OGM is a duplicate for the neighbor
7 years, 11 months
[batman-adv] master: batman-adv: iv_ogm_orig_update, style, add missin brackets (3040f9c)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 3040f9c5c96d5cb9712a55d4ed0d69f04c386614
Author: Markus Pargmann <mpa(a)pengutronix.de>
Date: Fri Dec 26 12:41:33 2014 +0100
batman-adv: iv_ogm_orig_update, style, add missin brackets
CodingStyle describes that either none or both branches of a conditional
have to have brackets.
Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
3040f9c5c96d5cb9712a55d4ed0d69f04c386614
bat_iv_ogm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index d1b921f..7d4f6bf 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -1032,9 +1032,10 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,
batadv_orig_node_free_ref(orig_tmp);
if (!neigh_node)
goto unlock;
- } else
+ } else {
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
"Updating existing last-hop neighbor of originator\n");
+ }
rcu_read_unlock();
neigh_ifinfo = batadv_neigh_ifinfo_new(neigh_node, if_outgoing);
7 years, 11 months
[batman-adv] master: batman-adv: iv_ogm_queue_add, Simplify expressions (253a6dd)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 253a6dd74fc7c27349ec0d89522cbaa095ba13e6
Author: Markus Pargmann <mpa(a)pengutronix.de>
Date: Fri Dec 26 12:41:32 2014 +0100
batman-adv: iv_ogm_queue_add, Simplify expressions
Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
253a6dd74fc7c27349ec0d89522cbaa095ba13e6
bat_iv_ogm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 7fb6bcb..d1b921f 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -750,13 +750,13 @@ static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv,
unsigned long max_aggregation_jiffies;
batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff;
- direct_link = batadv_ogm_packet->flags & BATADV_DIRECTLINK ? 1 : 0;
+ direct_link = !!(batadv_ogm_packet->flags & BATADV_DIRECTLINK);
max_aggregation_jiffies = msecs_to_jiffies(BATADV_MAX_AGGREGATION_MS);
/* find position for the packet in the forward queue */
spin_lock_bh(&bat_priv->forw_bat_list_lock);
/* own packets are not to be aggregated */
- if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) {
+ if (atomic_read(&bat_priv->aggregated_ogms) && !own_packet) {
hlist_for_each_entry(forw_packet_pos,
&bat_priv->forw_bat_list, list) {
if (batadv_iv_ogm_can_aggregate(batadv_ogm_packet,
7 years, 11 months
[linux-merge]linux integration; annotated tag, v4.0-rc1, created. v4.0-rc1
by postmaster@open-mesh.org
The annotated tag, v4.0-rc1 has been created
at 2e0c59488ed2cd9f563dbbc0c8dadf1ff6d985d8 (tag)
tagging c517d838eb7d07bbe9507871fab3931deccff539 (commit)
replaces v3.19
tagged by Linus Torvalds
on Sun Feb 22 18:32:41 2015 -0800
- Shortlog ------------------------------------------------------------
Linux 34.0-rc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJU6pFJAAoJEHm+PkMAQRiG2OwH/24nDK+l9zkaRs0xJsVh+qiW
8A2N1od0ickz43iMk48jfeWGkFOkd4izyvan/daJshJOE1Y5lCdSs7jq/OXVOv9L
G0+KQUoC5NL0hqYKn1XJPFluNQ1yqMvrDwQt99grDGzruNGBbwHuBhAQmgzpj1nU
do8KrGjr7ft1Rzm4mOAdET/ExWiF+mRSJSxxOv598HbsIRdM5wgn0hHjPlqDxmLN
KH4r3YYEm0cHyjf4Krse0+YdhqdamRGJlmYxJgEsYNwCoMwkmHlLTc71diseUhrg
r/VYIYQvpAA6Yvgw8rJ0N5gk/sJJig+WyyPhfQuc2bD5sbL9eO7mPnz2UP7z7ss=
=vXB6
-----END PGP SIGNATURE-----
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
-----------------------------------------------------------------------
--
linux integration
7 years, 11 months
[batman-adv] master: batman-adv: iv_ogm_aggregate_new, simplify error handling (a467a76)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit a467a767dace62a63652fa757d54c13586054ad8
Author: Markus Pargmann <mpa(a)pengutronix.de>
Date: Fri Dec 26 12:41:31 2014 +0100
batman-adv: iv_ogm_aggregate_new, simplify error handling
It is just a bit easier to put the error handling at one place and let
multiple error paths use the same calls.
Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
a467a767dace62a63652fa757d54c13586054ad8
bat_iv_ogm.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 9555aa6..7fb6bcb 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -642,19 +642,16 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff,
if (!batadv_atomic_dec_not_zero(&bat_priv->batman_queue_left)) {
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
"batman packet queue full\n");
- goto out;
+ goto out_free_outgoing;
}
}
forw_packet_aggr = kmalloc(sizeof(*forw_packet_aggr), GFP_ATOMIC);
- if (!forw_packet_aggr) {
- if (!own_packet)
- atomic_inc(&bat_priv->batman_queue_left);
- goto out;
- }
+ if (!forw_packet_aggr)
+ goto out_nomem;
- if ((atomic_read(&bat_priv->aggregated_ogms)) &&
- (packet_len < BATADV_MAX_AGGREGATION_BYTES))
+ if (atomic_read(&bat_priv->aggregated_ogms) &&
+ packet_len < BATADV_MAX_AGGREGATION_BYTES)
skb_size = BATADV_MAX_AGGREGATION_BYTES;
else
skb_size = packet_len;
@@ -662,12 +659,8 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff,
skb_size += ETH_HLEN;
forw_packet_aggr->skb = netdev_alloc_skb_ip_align(NULL, skb_size);
- if (!forw_packet_aggr->skb) {
- if (!own_packet)
- atomic_inc(&bat_priv->batman_queue_left);
- kfree(forw_packet_aggr);
- goto out;
- }
+ if (!forw_packet_aggr->skb)
+ goto out_free_forw_packet;
forw_packet_aggr->skb->priority = TC_PRIO_CONTROL;
skb_reserve(forw_packet_aggr->skb, ETH_HLEN);
@@ -699,7 +692,12 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff,
send_time - jiffies);
return;
-out:
+out_free_forw_packet:
+ kfree(forw_packet_aggr);
+out_nomem:
+ if (!own_packet)
+ atomic_inc(&bat_priv->batman_queue_left);
+out_free_outgoing:
batadv_hardif_free_ref(if_outgoing);
out_free_incoming:
batadv_hardif_free_ref(if_incoming);
7 years, 11 months
[batman-adv] master: Merge branch 'next' (02c9bee)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 02c9beefb8a2d23018f6adfdee4efe5161e81361
Merge: 2f9d8a2 e36785e
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Tue Feb 24 00:43:45 2015 +0800
Merge branch 'next'
>---------------------------------------------------------------
02c9beefb8a2d23018f6adfdee4efe5161e81361
gateway_client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
7 years, 11 months
[batman-adv] next: batman-adv: Fix use of seq_has_overflowed() (e36785e)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : next
>---------------------------------------------------------------
commit e36785ec715e75d2cc6fa48d0115285d9b9ad583
Author: Joe Perches <joe(a)perches.com>
Date: Sun Feb 22 13:47:56 2015 -0800
batman-adv: Fix use of seq_has_overflowed()
net-next commit 6d91147d183c ("batman-adv: Remove uses of return value
of seq_printf") incorrectly changed the overflow occurred return from
-1 to 1. Change it back so that the test of batadv_write_buffer_text's
return value in batadv_gw_client_seq_print_text works properly.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
e36785ec715e75d2cc6fa48d0115285d9b9ad583
gateway_client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gateway_client.c b/gateway_client.c
index a0876ea..090828c 100644
--- a/gateway_client.c
+++ b/gateway_client.c
@@ -601,7 +601,7 @@ static int batadv_write_buffer_text(struct batadv_priv *bat_priv,
gw_node->bandwidth_down % 10,
gw_node->bandwidth_up / 10,
gw_node->bandwidth_up % 10);
- ret = seq_has_overflowed(seq);
+ ret = seq_has_overflowed(seq) ? -1 : 0;
if (curr_gw)
batadv_gw_node_free_ref(curr_gw);
7 years, 11 months
[batman-adv] master: batman-adv: checkpatch - wrong alignment (2f9d8a2)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 2f9d8a204227ab1f485852cc52f8bdb3ccb4ee18
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Fri Feb 20 00:02:45 2015 +0800
batman-adv: checkpatch - wrong alignment
Introduced by fe67bb41f0e1647c3b05aeb4b736a1171bff496b
("batman-adv: debugfs, avoid compiling for !DEBUG_FS")
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
2f9d8a204227ab1f485852cc52f8bdb3ccb4ee18
debugfs.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debugfs.h b/debugfs.h
index 5db336a..421f092 100644
--- a/debugfs.h
+++ b/debugfs.h
@@ -48,14 +48,14 @@ static inline void batadv_debugfs_del_meshif(struct net_device *dev)
{
}
-static inline int batadv_debugfs_add_hardif(
- struct batadv_hard_iface *hard_iface)
+static inline
+int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface)
{
return 0;
}
-static inline void batadv_debugfs_del_hardif(
- struct batadv_hard_iface *hard_iface)
+static inline
+void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface)
{
}
7 years, 11 months