Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 0cc45699f6f17b3ed3e2542540ca0634f4e20ed8 Author: Markus Pargmann mpa@pengutronix.de Date: Fri Dec 26 12:41:26 2014 +0100

batman-adv: iv_ogm_iface_enable, direct return values

Directly return error values. No need to use a return variable.

Signed-off-by: Markus Pargmann mpa@pengutronix.de Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

0cc45699f6f17b3ed3e2542540ca0634f4e20ed8 bat_iv_ogm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 00e00e0..7b935a8 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -308,7 +308,6 @@ 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; - int res = -ENOMEM;

/* randomize initial seqno to avoid collision */ get_random_bytes(&random_seqno, sizeof(random_seqno)); @@ -317,7 +316,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); if (!ogm_buff) - goto out; + return -ENOMEM;

hard_iface->bat_iv.ogm_buff = ogm_buff;

@@ -329,10 +328,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) batadv_ogm_packet->reserved = 0; batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE;

- res = 0; - -out: - return res; + return 0; }

static void batadv_iv_ogm_iface_disable(struct batadv_hard_iface *hard_iface)